Skip to content

G
getme
Commit 2b6b7cdd by Adarsh K
Options

changes

parents a6945f34 523b5916
Showing with 1181 additions and 1100 deletions
config.xml
...@@ -106,5 +106,5 @@ ...@@ -106,5 +106,5 @@
</plugin> </plugin>
<plugin name="cordova-plugin-nativegeocoder" spec="3.2.2" /> <plugin name="cordova-plugin-nativegeocoder" spec="3.2.2" />
<plugin name="cordova-plugin-statusbar" spec="^2.4.2" /> <plugin name="cordova-plugin-statusbar" spec="^2.4.2" />
<engine name="android" spec="8.0.0" /> <plugin name="cordova-plugin-ionic-keyboard" spec="2.2.0" />
</widget> </widget>
package-lock.json
...@@ -1253,45 +1253,79 @@ ...@@ -1253,45 +1253,79 @@
} }
} }
}, },
"@firebase/analytics": {
"version": "0.2.15",
"resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.2.15.tgz",
"integrity": "sha512-pNRyLU6PndZa0iO+HN+GwY1HobsyU584a1KN5ZWBuwaqbUOB/99uChn2n6XaPrlD/G07uzv6dpw558IQXahhow==",
"requires": {
"@firebase/analytics-types": "0.2.7",
"@firebase/component": "0.1.6",
"@firebase/installations": "0.4.4",
"@firebase/util": "0.2.41",
"tslib": "1.10.0"
}
},
"@firebase/analytics-types": {
"version": "0.2.7",
"resolved": "https://registry.npmjs.org/@firebase/analytics-types/-/analytics-types-0.2.7.tgz",
"integrity": "sha512-2596a1v62BkVXuobbQerC1gDavoxFOmgVutFFQcm24v6/2Iv8nlx2k8Wjy9eLAZWmAZHU/RkTX11K9gHy+w5Bg=="
},
"@firebase/app": { "@firebase/app": {
"version": "0.4.17", "version": "0.5.5",
"resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.4.17.tgz", "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.5.5.tgz",
"integrity": "sha512-YkCe10/KHnfJ5Lx79SCQ4ZJRlpnwe8Yns6Ntf7kltXq1hCQCUrKEU3zaOTPY90SBx36hYm47IaqkKwT/kBOK3A==", "integrity": "sha512-CCqX/ZuNkPnyE2jQapVAHpp3Y0cSJZVBQRl+YjcmtfeiCl8WcUb7pyVJZYLPEw5xZZZVJWOrZXO393teiFtsIg==",
"requires": { "requires": {
"@firebase/app-types": "0.4.3", "@firebase/app-types": "0.5.2",
"@firebase/logger": "0.1.25", "@firebase/component": "0.1.6",
"@firebase/util": "0.2.28", "@firebase/logger": "0.1.36",
"@firebase/util": "0.2.41",
"dom-storage": "2.1.0", "dom-storage": "2.1.0",
"tslib": "1.10.0", "tslib": "1.10.0",
"xmlhttprequest": "1.8.0" "xmlhttprequest": "1.8.0"
} }
}, },
"@firebase/app-types": { "@firebase/app-types": {
"version": "0.4.3", "version": "0.5.2",
"resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.4.3.tgz", "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.5.2.tgz",
"integrity": "sha512-VU5c+ZjejvefLVH4cjiX3Hy1w9HYMv7TtZ1tF9ZmOqT4DSIU1a3VISWoo8///cGGffr5IirMO+Q/WZLI4p8VcA==" "integrity": "sha512-k3zRi9gXyWrymu8OL6DA1Pz7eo+sKVBopX5ouOjQwozAZ55WhelifPC99WHmLWo8sAokNM0XDyzM7loOA5yliQ=="
}, },
"@firebase/auth": { "@firebase/auth": {
"version": "0.12.0", "version": "0.13.6",
"resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-0.12.0.tgz", "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-0.13.6.tgz",
"integrity": "sha512-DGYvAmz2aUmrWYS3ADw/UmsuicxJi6G+X38XITqNPUrd1YxmM5SBzX19oEb9WCrJZXcr4JaESg6hQkT2yEPaCA==", "integrity": "sha512-ERlda/t5RimNw5Err+5HJATC/qFkC64zR40G+4nK5b9eFJEm0MB+/DaismCwp6J6GoVL3NmejoVbuWU7sV4G1w==",
"requires": { "requires": {
"@firebase/auth-types": "0.8.0" "@firebase/auth-types": "0.9.6"
} }
}, },
"@firebase/auth-interop-types": {
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.1.3.tgz",
"integrity": "sha512-Fd0MJ8hHw/MasNTJz7vl5jnMMs71X6pY/VqN0V6lqdP5HKTuyPVnffJ1d2Vb6uCLZ1D7nXAer4YWj9cOrNLPAQ=="
},
"@firebase/auth-types": { "@firebase/auth-types": {
"version": "0.8.0", "version": "0.9.6",
"resolved": "https://registry.npmjs.org/@firebase/auth-types/-/auth-types-0.8.0.tgz", "resolved": "https://registry.npmjs.org/@firebase/auth-types/-/auth-types-0.9.6.tgz",
"integrity": "sha512-foQHhvyB0RR+mb/+wmHXd/VOU+D8fruFEW1k79Q9wzyTPpovMBa1Mcns5fwEWBhUfi8bmoEtaGB8RSAHnTFzTg==" "integrity": "sha512-HB1yXe5hgiwPMukLBEfC3TQX22U9qKczj8kEclKhL7rnds3FKZWMM0+EpKbcJREbU9Sj/rgwgaio7ovSN4ZQFA=="
}, },
"@firebase/database": { "@firebase/component": {
"version": "0.5.4", "version": "0.1.6",
"resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.5.4.tgz", "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.1.6.tgz",
"integrity": "sha512-Hz1Bi3fzIcNNocE4EhvvwoEQGurG2BGssWD3/6a2bzty+K1e57SLea2Ied8QYNBUU1zt/4McHfa3Y71EQIyn/w==", "integrity": "sha512-dm5pVhm+sU8ag1M3hY6vleA/H7Ed8sKRxbm4TAKhtjGHDejPXxnK0meTNydJ3MwisHWlwzGuzIEhb223K7FFxA==",
"requires": { "requires": {
"@firebase/database-types": "0.4.3", "@firebase/util": "0.2.41",
"@firebase/logger": "0.1.25", "tslib": "1.10.0"
"@firebase/util": "0.2.28", }
},
"@firebase/database": {
"version": "0.5.22",
"resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.5.22.tgz",
"integrity": "sha512-3CVsmLFscFIAFOjjVhlT6HzFOhS0TKVbjhixp64oVZMOshp9qPHtHIytf6QXRAypbtZMPFAMGnhNu0pmPW/vtg==",
"requires": {
"@firebase/auth-interop-types": "0.1.3",
"@firebase/component": "0.1.6",
"@firebase/database-types": "0.4.12",
"@firebase/logger": "0.1.36",
"@firebase/util": "0.2.41",
"faye-websocket": "0.11.3", "faye-websocket": "0.11.3",
"tslib": "1.10.0" "tslib": "1.10.0"
}, },
...@@ -1307,115 +1341,122 @@ ...@@ -1307,115 +1341,122 @@
} }
}, },
"@firebase/database-types": { "@firebase/database-types": {
"version": "0.4.3", "version": "0.4.12",
"resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.4.3.tgz", "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.4.12.tgz",
"integrity": "sha512-21yCiJA2Tyt6dJYwWeB69MwoawBu5UWNtP6MAY0ugyRBHVdjAMHMYalPxCjZ46LAmhfim0+i8NXRadOFVS3hUA==", "integrity": "sha512-PVCTQRG9fnN1cam3Qr91+WzsCf9tO+lmUcPEb0uvafSFVhvx2U9OZOlYDdM5hS0MMHTNXI7Ywmc33EheIlLmMw==",
"requires": { "requires": {
"@firebase/app-types": "0.x" "@firebase/app-types": "0.5.2"
} }
}, },
"@firebase/firestore": { "@firebase/firestore": {
"version": "1.5.3", "version": "1.11.2",
"resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-1.5.3.tgz", "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-1.11.2.tgz",
"integrity": "sha512-O/yAbXpitOA6g627cUl0/FHYlkTy1EiEKMKOlnlMOJF2fH+nLVZREXjsrCC7N2tIvTn7yYwfpZ4zpSNvrhwiTA==", "integrity": "sha512-WWTKQGUYvZ7BELzEeIhINVm+iKL2ki/f0y16Qc3kABCW4kdXtiUHak6uWMFQ3IXHtnpDGzcNTyDAKOWeZx+TzA==",
"requires": { "requires": {
"@firebase/firestore-types": "1.5.0", "@firebase/component": "0.1.6",
"@firebase/logger": "0.1.25", "@firebase/firestore-types": "1.9.2",
"@firebase/util": "0.2.28", "@firebase/logger": "0.1.36",
"@firebase/webchannel-wrapper": "0.2.26", "@firebase/util": "0.2.41",
"@firebase/webchannel-wrapper": "0.2.36",
"@grpc/proto-loader": "^0.5.0", "@grpc/proto-loader": "^0.5.0",
"grpc": "1.23.3", "grpc": "1.24.2",
"tslib": "1.10.0" "tslib": "1.10.0"
} }
}, },
"@firebase/firestore-types": { "@firebase/firestore-types": {
"version": "1.5.0", "version": "1.9.2",
"resolved": "https://registry.npmjs.org/@firebase/firestore-types/-/firestore-types-1.5.0.tgz", "resolved": "https://registry.npmjs.org/@firebase/firestore-types/-/firestore-types-1.9.2.tgz",
"integrity": "sha512-VhRHNbEbak+R2iK8e1ir2Lec7eaHMZpGTRy6LMtzATYthlkwNHF9tO8JU8l6d1/kYkI4+DWzX++i3HhTziHEWA==" "integrity": "sha512-D264aOrssdbD3PE0JuJdbwBI9zXDTd5HASjJYtYc3AIGC526R+w+TDWes4GsE/zi0dSWqMfgiceVKL0PekjqZw=="
}, },
"@firebase/functions": { "@firebase/functions": {
"version": "0.4.18", "version": "0.4.36",
"resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.4.18.tgz", "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.4.36.tgz",
"integrity": "sha512-N/ijwpxJy26kOErYIi5QS8pQgMZEuEMF/zDaNmgqcoN3J8P52NhBnVQZnIl+U4W96nQfNiURhSwXEERHFyvSZQ==", "integrity": "sha512-GheZOwxUbMHhM1xidkOJlfTGk4FuC2sJBA9/yYA23St5qgudcT0Bu3r+3XcC4DhJv6G/mu2IoM9dn1LBgBclXw==",
"requires": { "requires": {
"@firebase/functions-types": "0.3.8", "@firebase/component": "0.1.6",
"@firebase/messaging-types": "0.3.2", "@firebase/functions-types": "0.3.15",
"@firebase/messaging-types": "0.4.3",
"isomorphic-fetch": "2.2.1", "isomorphic-fetch": "2.2.1",
"tslib": "1.10.0" "tslib": "1.10.0"
} }
}, },
"@firebase/functions-types": { "@firebase/functions-types": {
"version": "0.3.8", "version": "0.3.15",
"resolved": "https://registry.npmjs.org/@firebase/functions-types/-/functions-types-0.3.8.tgz", "resolved": "https://registry.npmjs.org/@firebase/functions-types/-/functions-types-0.3.15.tgz",
"integrity": "sha512-9hajHxA4UWVCGFmoL8PBYHpamE3JTNjObieMmnvZw3cMRTP2EwipMpzZi+GPbMlA/9swF9yHCY/XFAEkwbvdgQ==" "integrity": "sha512-VM0v7fJM+mzvL9tJgNtQWc3UZLUOl2GJYi0TdfiuqTbfEdPDQCXtYVTN3roAO5LJTIgNw0imZyOCgsHDy9MtXg=="
}, },
"@firebase/installations": { "@firebase/installations": {
"version": "0.2.7", "version": "0.4.4",
"resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.2.7.tgz", "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.4.4.tgz",
"integrity": "sha512-67tzowHVwRBtEuB1HLMD+fCdoRyinOQlMKBes7UwrtZIVd0CPDUqAKxNqup5EypWZb7O2tqFtRzK7POajfSNMA==", "integrity": "sha512-gbfK5dOKe1SyveF7Ko7Bg/LtTPoX3cByoGUv7LMR0Q7Dn8Qw9JsIz2n7q21tr2YzAxv1q7RqIzRJchoFicqISA==",
"requires": { "requires": {
"@firebase/installations-types": "0.1.2", "@firebase/component": "0.1.6",
"@firebase/util": "0.2.28", "@firebase/installations-types": "0.3.2",
"@firebase/util": "0.2.41",
"idb": "3.0.2", "idb": "3.0.2",
"tslib": "1.10.0" "tslib": "1.10.0"
} }
}, },
"@firebase/installations-types": { "@firebase/installations-types": {
"version": "0.1.2", "version": "0.3.2",
"resolved": "https://registry.npmjs.org/@firebase/installations-types/-/installations-types-0.1.2.tgz", "resolved": "https://registry.npmjs.org/@firebase/installations-types/-/installations-types-0.3.2.tgz",
"integrity": "sha512-fQaWIW8hyX1XUN7+FCSPjvM1agFjGidVuF4Sxi7aFwfyh5t+4fD2VpM4wCQbWmodnx4fZLvsuQd9mkxxU+lGYQ==" "integrity": "sha512-E5Jp1QlwYSypRiOJSkKtEC2RS8GnubUYqTAqjiJAtBsa0guZZunBcXvdn3kqWOyn3R4HaM2tDZ/bGdWpulVUkg=="
}, },
"@firebase/logger": { "@firebase/logger": {
"version": "0.1.25", "version": "0.1.36",
"resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.1.25.tgz", "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.1.36.tgz",
"integrity": "sha512-/lRhuepVcCCnQ2jcO5Hr08SYdmZDTQU9fdPdzg+qXJ9k/QnIrD2RbswXQcL6mmae3uPpX7fFXQAoScJ9pzp50w==" "integrity": "sha512-5Z0ryTtzRk7kjUb0/18r10oXYu8mSPAjgdbLowRBP6HdSJB7BDiUIRS7iATSmUBZLTArdroSiFJ29m7YDfm/cw=="
}, },
"@firebase/messaging": { "@firebase/messaging": {
"version": "0.4.11", "version": "0.6.8",
"resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.4.11.tgz", "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.6.8.tgz",
"integrity": "sha512-KYt479yio6ThkV7Pb9LRB1KPIBio+OR4RozwyoLC1ZSVQdTIrd/sVEuDSzYY88Wh/6Kg6ejdu2z6mfWG9l1ZaQ==", "integrity": "sha512-APMuLpx2XnYCQMvKI9W17CfNOi+YhecoU5gZLwUuuspZvgasr28daSNNU+QcjdMPsJsIbU9UDJa4do8x2uAEig==",
"requires": { "requires": {
"@firebase/messaging-types": "0.3.2", "@firebase/component": "0.1.6",
"@firebase/util": "0.2.28", "@firebase/installations": "0.4.4",
"@firebase/messaging-types": "0.4.3",
"@firebase/util": "0.2.41",
"idb": "3.0.2",
"tslib": "1.10.0" "tslib": "1.10.0"
} }
}, },
"@firebase/messaging-types": { "@firebase/messaging-types": {
"version": "0.3.2", "version": "0.4.3",
"resolved": "https://registry.npmjs.org/@firebase/messaging-types/-/messaging-types-0.3.2.tgz", "resolved": "https://registry.npmjs.org/@firebase/messaging-types/-/messaging-types-0.4.3.tgz",
"integrity": "sha512-2qa2qNKqpalmtwaUV3+wQqfCm5myP/dViIBv+pXF8HinemIfO1IPQtr9pCNfsSYyus78qEhtfldnPWXxUH5v0w==" "integrity": "sha512-FxUQXjy5p/5r6E/pGS3Bnp3+3wshh3vkCo7ISU7ggOM6GBhq9FnyBLZKGix7bsjn079sNTOr5PH0KT8wGI+CPQ=="
}, },
"@firebase/performance": { "@firebase/performance": {
"version": "0.2.19", "version": "0.2.34",
"resolved": "https://registry.npmjs.org/@firebase/performance/-/performance-0.2.19.tgz", "resolved": "https://registry.npmjs.org/@firebase/performance/-/performance-0.2.34.tgz",
"integrity": "sha512-dINWwR/XcSiSnFNNX7QWfec8bymiXk1Zp6mPyPN+R9ONMrpDbygQUy06oT/6r/xx9nHG4Za6KMUJag3sWNKqnQ==", "integrity": "sha512-Ek038Acq0mbVqsw7TGqomFDBxvoTIu1rdRdqRKSdFiBRZcLLW9X1Ad6aSATMu6lki2gcUE/XCbMJtSQfVsl5Bw==",
"requires": { "requires": {
"@firebase/installations": "0.2.7", "@firebase/component": "0.1.6",
"@firebase/logger": "0.1.25", "@firebase/installations": "0.4.4",
"@firebase/performance-types": "0.0.3", "@firebase/logger": "0.1.36",
"@firebase/util": "0.2.28", "@firebase/performance-types": "0.0.11",
"@firebase/util": "0.2.41",
"tslib": "1.10.0" "tslib": "1.10.0"
} }
}, },
"@firebase/performance-types": { "@firebase/performance-types": {
"version": "0.0.3", "version": "0.0.11",
"resolved": "https://registry.npmjs.org/@firebase/performance-types/-/performance-types-0.0.3.tgz", "resolved": "https://registry.npmjs.org/@firebase/performance-types/-/performance-types-0.0.11.tgz",
"integrity": "sha512-RuC63nYJPJU65AsrNMc3fTRcRgHiyNcQLh9ufeKUT1mEsFgpxr167gMb+tpzNU4jsbvM6+c6nQAFdHpqcGkRlQ==" "integrity": "sha512-w6dD4ZcWT1NsGsPcgX1lAVZyxEVEWgTSBu768YABCQH7zVcvPo9PE3xWcPWPujlAPf9QXdessiX9cC5m4Khabw=="
}, },
"@firebase/polyfill": { "@firebase/polyfill": {
"version": "0.3.22", "version": "0.3.31",
"resolved": "https://registry.npmjs.org/@firebase/polyfill/-/polyfill-0.3.22.tgz", "resolved": "https://registry.npmjs.org/@firebase/polyfill/-/polyfill-0.3.31.tgz",
"integrity": "sha512-PYbEqDHJhJJoF2Q5IB/oP0Tz6O2vSUPtODy9kUQibi+T0bK1gkTaySPwz8GAgHfIpFNENj1kK+7Xpf87R8bYbw==", "integrity": "sha512-7XItMz50tdba57tCOTCSH8REvHYbrTU7MBOksnNZ3td/J9W/RkCPcLVSSnFWNmn0Jv1aufpUevryX1J4DZ/oiw==",
"requires": { "requires": {
"core-js": "3.2.1", "core-js": "3.6.2",
"promise-polyfill": "8.1.3", "promise-polyfill": "8.1.3",
"whatwg-fetch": "2.0.4" "whatwg-fetch": "2.0.4"
}, },
"dependencies": { "dependencies": {
"core-js": { "core-js": {
"version": "3.2.1", "version": "3.6.2",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.2.1.tgz", "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.2.tgz",
"integrity": "sha512-Qa5XSVefSVPRxy2XfUC13WbvqkxhkwB3ve+pgCQveNgYzbM/UxZeu1dcOX/xr4UmfUd+muuvsaxilQzCyUurMw==" "integrity": "sha512-hIE5dXkRzRvnZ5vhkRfQxUvDxQZmD9oueA08jDYRBKJHx+VIl/Pne/e0A4x9LObEEthC/TqiZybUoNM4tRgnKg=="
}, },
"whatwg-fetch": { "whatwg-fetch": {
"version": "2.0.4", "version": "2.0.4",
...@@ -1424,33 +1465,52 @@ ...@@ -1424,33 +1465,52 @@
} }
} }
}, },
"@firebase/remote-config": {
"version": "0.1.15",
"resolved": "https://registry.npmjs.org/@firebase/remote-config/-/remote-config-0.1.15.tgz",
"integrity": "sha512-avBM6w6oLV3fEBVGTXdIBKuj62p4Zcu0/01Xm4YEsdrMRfyLX1Q9C5XYIsGiGb6xM+R8EWzd5F4AsAMtc/ofQw==",
"requires": {
"@firebase/component": "0.1.6",
"@firebase/installations": "0.4.4",
"@firebase/logger": "0.1.36",
"@firebase/remote-config-types": "0.1.7",
"@firebase/util": "0.2.41",
"tslib": "1.10.0"
}
},
"@firebase/remote-config-types": {
"version": "0.1.7",
"resolved": "https://registry.npmjs.org/@firebase/remote-config-types/-/remote-config-types-0.1.7.tgz",
"integrity": "sha512-oWyw1KNx/2+vaNBe1zYSppe5eSmjLxIphi49VAwYWO3SqhxpF3BsJ0uo4f9pU4bjYINuRFMYsCkbhZuKAR7o+w=="
},
"@firebase/storage": { "@firebase/storage": {
"version": "0.3.12", "version": "0.3.28",
"resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.3.12.tgz", "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.3.28.tgz",
"integrity": "sha512-8hXt3qPZlVH+yPF4W9Dc15/gBiTPGUJUgYs3dH9WnO41QWl1o4aNlZpZK/pdnpCIO1GmN0+PxJW9TCNb0H0Hqw==", "integrity": "sha512-70GFutKqYBkqN3TCXgd8asGc/i3NYuCpaBvCHk7QpwN+7/9Cukba4GOfiN1QIINc7nOj/nrsWKvo49NzhxGy4w==",
"requires": { "requires": {
"@firebase/storage-types": "0.3.3", "@firebase/component": "0.1.6",
"@firebase/util": "0.2.28", "@firebase/storage-types": "0.3.10",
"@firebase/util": "0.2.41",
"tslib": "1.10.0" "tslib": "1.10.0"
} }
}, },
"@firebase/storage-types": { "@firebase/storage-types": {
"version": "0.3.3", "version": "0.3.10",
"resolved": "https://registry.npmjs.org/@firebase/storage-types/-/storage-types-0.3.3.tgz", "resolved": "https://registry.npmjs.org/@firebase/storage-types/-/storage-types-0.3.10.tgz",
"integrity": "sha512-fUp4kpbxwDiWs/aIBJqBvXgFHZvgoND2JA0gJYSEsXtWtVwfgzY/710plErgZDeQKopX5eOR1sHskZkQUy0U6w==" "integrity": "sha512-c76gnTUFTDDumV4GenkuVY34EwAXjN7ZWLR6NSvuAnMvBlROdGKshTCsmyi8GTMd/dDoFB/MLJ+YOnk5tMbU4Q=="
}, },
"@firebase/util": { "@firebase/util": {
"version": "0.2.28", "version": "0.2.41",
"resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz", "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.41.tgz",
"integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==", "integrity": "sha512-QRu3wjU5I0ZBWrf4wgrEBYu5K5tkHjETMDPMY8WYCeekKB13k2MuJzHBjQVuStEOU7j6ygTAA0B8vXI/6B5D0g==",
"requires": { "requires": {
"tslib": "1.10.0" "tslib": "1.10.0"
} }
}, },
"@firebase/webchannel-wrapper": { "@firebase/webchannel-wrapper": {
"version": "0.2.26", "version": "0.2.36",
"resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.2.26.tgz", "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.2.36.tgz",
"integrity": "sha512-VlTurkvs4v7EVFWESBZGOPghFEokQhU5au5CP9WqA8B2/PcQRDsaaQlQCA6VATuEnW+vtSiSBvTiOc4004f8xg==" "integrity": "sha512-Vy7N8674HVHLZtRfZurvxThYeIi4sK1AeiV6DKFfndhGDfC/+iKHidoC/pgFoIIJR8E8tH5QD22Wndb0iW6cxw=="
}, },
"@grpc/proto-loader": { "@grpc/proto-loader": {
"version": "0.5.3", "version": "0.5.3",
...@@ -1500,6 +1560,21 @@ ...@@ -1500,6 +1560,21 @@
"@types/cordova": "^0.0.34" "@types/cordova": "^0.0.34"
} }
}, },
"@ionic-native/keyboard": {
"version": "5.21.6",
"resolved": "https://registry.npmjs.org/@ionic-native/keyboard/-/keyboard-5.21.6.tgz",
"integrity": "sha512-pzWtZURWPLA2c+OjVdgxAIJfk+PEp+r3HiwW+Nk0TbJEJSKoDJM0/NS8f0qqE+VAbN0NGXL5y0LhMppwE05n6Q==",
"requires": {
"@types/cordova": "^0.0.34"
},
"dependencies": {
"@types/cordova": {
"version": "0.0.34",
"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
}
}
},
"@ionic-native/native-geocoder": { "@ionic-native/native-geocoder": {
"version": "5.19.1", "version": "5.19.1",
"resolved": "https://registry.npmjs.org/@ionic-native/native-geocoder/-/native-geocoder-5.19.1.tgz", "resolved": "https://registry.npmjs.org/@ionic-native/native-geocoder/-/native-geocoder-5.19.1.tgz",
...@@ -2243,6 +2318,11 @@ ...@@ -2243,6 +2318,11 @@
"integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==", "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
"dev": true "dev": true
}, },
"array-ify": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz",
"integrity": "sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4="
},
"array-union": { "array-union": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
...@@ -3337,6 +3417,15 @@ ...@@ -3337,6 +3417,15 @@
"integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
"dev": true "dev": true
}, },
"compare-func": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/compare-func/-/compare-func-1.3.2.tgz",
"integrity": "sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=",
"requires": {
"array-ify": "^1.0.0",
"dot-prop": "^3.0.0"
}
},
"compare-versions": { "compare-versions": {
"version": "3.5.1", "version": "3.5.1",
"resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.5.1.tgz", "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.5.1.tgz",
...@@ -3512,17 +3601,24 @@ ...@@ -3512,17 +3601,24 @@
} }
}, },
"cordova-android": { "cordova-android": {
"version": "8.0.0", "version": "8.1.0",
"resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-8.0.0.tgz", "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-8.1.0.tgz",
"integrity": "sha512-Ipv8HbVJpxEyYFSFLTEOaLRp0yxBtJVNbgSuDEB4naa34FzQaRWSNiiMcPJnO+x3hRXNt7pcwa46hARNzhn7+w==", "integrity": "sha512-eAY6g9q3raJ4P03wNdSWC5MOW1EfxoomWNXsPhi7T6Q9yAqmxqn0sLEUjLL1Ib0LCH3nKQWBXdxapQ5LgbHu+g==",
"requires": { "requires": {
"android-versions": "^1.3.0", "android-versions": "^1.4.0",
"cordova-common": "^3.1.0", "compare-func": "^1.3.2",
"elementtree": "^0.1.7", "cordova-common": "^3.2.0",
"nopt": "^4.0.1", "nopt": "^4.0.1",
"properties-parser": "^0.3.1", "properties-parser": "^0.3.1",
"q": "^1.4.1", "q": "^1.5.1",
"shelljs": "^0.5.3" "shelljs": "^0.5.3"
},
"dependencies": {
"q": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
"integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc="
}
} }
}, },
"cordova-common": { "cordova-common": {
...@@ -3857,6 +3953,7 @@ ...@@ -3857,6 +3953,7 @@
"version": "1.1.3", "version": "1.1.3",
"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
"integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
"dev": true,
"requires": { "requires": {
"object-keys": "^1.0.12" "object-keys": "^1.0.12"
} }
...@@ -3902,11 +3999,6 @@ ...@@ -3902,11 +3999,6 @@
} }
} }
}, },
"defined": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
"integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM="
},
"del": { "del": {
"version": "4.1.1", "version": "4.1.1",
"resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz", "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
...@@ -4084,12 +4176,12 @@ ...@@ -4084,12 +4176,12 @@
"integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==", "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
"dev": true "dev": true
}, },
"dotignore": { "dot-prop": {
"version": "0.1.2", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/dotignore/-/dotignore-0.1.2.tgz", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz",
"integrity": "sha512-UGGGWfSauusaVJC+8fgV+NVvBXkCTmVv7sk6nojDZZvuOUNGUy0Zk4UpHQD6EDjS0jpBwcACvH4eofvyzBcRDw==", "integrity": "sha1-G3CK8JSknJoOfbyteQq6U52sEXc=",
"requires": { "requires": {
"minimatch": "^3.0.4" "is-obj": "^1.0.0"
} }
}, },
"duplexify": { "duplexify": {
...@@ -4192,13 +4284,13 @@ ...@@ -4192,13 +4284,13 @@
} }
}, },
"endent": { "endent": {
"version": "1.4.0", "version": "1.4.1",
"resolved": "https://registry.npmjs.org/endent/-/endent-1.4.0.tgz", "resolved": "https://registry.npmjs.org/endent/-/endent-1.4.1.tgz",
"integrity": "sha512-V9cYHc4IcnE9hYCuZat9YVUxIsK3gLB3gEUnr07rqElI+3TB+yC/wmMTNZ7L4xDmDFwg4Lypl5Gc3i+23komhA==", "integrity": "sha512-buHTb5c8AC9NshtP6dgmNLYkiT+olskbq1z6cEGvfGCF3Qphbu/1zz5Xu+yjTDln8RbxNhPoUyJ5H8MSrp1olQ==",
"requires": { "requires": {
"dedent": "^0.7.0", "dedent": "^0.7.0",
"fast-json-parse": "^1.0.3", "fast-json-parse": "^1.0.3",
"objectorarray": "^1.0.3" "objectorarray": "^1.0.4"
} }
}, },
"engine.io": { "engine.io": {
...@@ -4804,22 +4896,24 @@ ...@@ -4804,22 +4896,24 @@
} }
}, },
"firebase": { "firebase": {
"version": "6.6.2", "version": "7.9.3",
"resolved": "https://registry.npmjs.org/firebase/-/firebase-6.6.2.tgz", "resolved": "https://registry.npmjs.org/firebase/-/firebase-7.9.3.tgz",
"integrity": "sha512-uL9uNbutC0T8GAxrGgOCC35Ven3QKJqzJozNoVIpBuiWrB9ifm9aKOxn44h6o5ouviax3LVvoiG2jLkLkdQq4A==", "integrity": "sha512-9tIxZvA8/Tf5p7nPMEE9zFklbmwqny4qHxGzwG3Hus4TInkxyYeiGY2L1mNTV+WuTJzQYuo9NtCRZLBnsChpqQ==",
"requires": { "requires": {
"@firebase/app": "0.4.17", "@firebase/analytics": "0.2.15",
"@firebase/app-types": "0.4.3", "@firebase/app": "0.5.5",
"@firebase/auth": "0.12.0", "@firebase/app-types": "0.5.2",
"@firebase/database": "0.5.4", "@firebase/auth": "0.13.6",
"@firebase/firestore": "1.5.3", "@firebase/database": "0.5.22",
"@firebase/functions": "0.4.18", "@firebase/firestore": "1.11.2",
"@firebase/installations": "0.2.7", "@firebase/functions": "0.4.36",
"@firebase/messaging": "0.4.11", "@firebase/installations": "0.4.4",
"@firebase/performance": "0.2.19", "@firebase/messaging": "0.6.8",
"@firebase/polyfill": "0.3.22", "@firebase/performance": "0.2.34",
"@firebase/storage": "0.3.12", "@firebase/polyfill": "0.3.31",
"@firebase/util": "0.2.28" "@firebase/remote-config": "0.1.15",
"@firebase/storage": "0.3.28",
"@firebase/util": "0.2.41"
} }
}, },
"flatted": { "flatted": {
...@@ -4864,14 +4958,6 @@ ...@@ -4864,14 +4958,6 @@
} }
} }
}, },
"for-each": {
"version": "0.3.3",
"resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
"integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
"requires": {
"is-callable": "^1.1.3"
}
},
"for-in": { "for-in": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
...@@ -4991,7 +5077,8 @@ ...@@ -4991,7 +5077,8 @@
"function-bind": { "function-bind": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
"dev": true
}, },
"genfun": { "genfun": {
"version": "5.0.0", "version": "5.0.0",
...@@ -5097,15 +5184,15 @@ ...@@ -5097,15 +5184,15 @@
"integrity": "sha512-b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw==" "integrity": "sha512-b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw=="
}, },
"grpc": { "grpc": {
"version": "1.23.3", "version": "1.24.2",
"resolved": "https://registry.npmjs.org/grpc/-/grpc-1.23.3.tgz", "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.24.2.tgz",
"integrity": "sha512-7vdzxPw9s5UYch4aUn4hyM5tMaouaxUUkwkgJlwbR4AXMxiYZJOv19N2ps2eKiuUbJovo5fnGF9hg/X91gWYjw==", "integrity": "sha512-EG3WH6AWMVvAiV15d+lr+K77HJ/KV/3FvMpjKjulXHbTwgDZkhkcWbwhxFAoTdxTkQvy0WFcO3Nog50QBbHZWw==",
"requires": { "requires": {
"@types/bytebuffer": "^5.0.40", "@types/bytebuffer": "^5.0.40",
"lodash.camelcase": "^4.3.0", "lodash.camelcase": "^4.3.0",
"lodash.clone": "^4.5.0", "lodash.clone": "^4.5.0",
"nan": "^2.13.2", "nan": "^2.13.2",
"node-pre-gyp": "^0.13.0", "node-pre-gyp": "^0.14.0",
"protobufjs": "^5.0.3" "protobufjs": "^5.0.3"
}, },
"dependencies": { "dependencies": {
...@@ -5147,7 +5234,7 @@ ...@@ -5147,7 +5234,7 @@
"integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=" "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8="
}, },
"chownr": { "chownr": {
"version": "1.1.2", "version": "1.1.3",
"bundled": true "bundled": true
}, },
"cliui": { "cliui": {
...@@ -5196,10 +5283,10 @@ ...@@ -5196,10 +5283,10 @@
"bundled": true "bundled": true
}, },
"fs-minipass": { "fs-minipass": {
"version": "1.2.6", "version": "1.2.7",
"bundled": true, "bundled": true,
"requires": { "requires": {
"minipass": "^2.2.1" "minipass": "^2.6.0"
} }
}, },
"fs.realpath": { "fs.realpath": {
...@@ -5244,7 +5331,7 @@ ...@@ -5244,7 +5331,7 @@
} }
}, },
"ignore-walk": { "ignore-walk": {
"version": "3.0.1", "version": "3.0.3",
"bundled": true, "bundled": true,
"requires": { "requires": {
"minimatch": "^3.0.4" "minimatch": "^3.0.4"
...@@ -5302,7 +5389,7 @@ ...@@ -5302,7 +5389,7 @@
"bundled": true "bundled": true
}, },
"minipass": { "minipass": {
"version": "2.3.5", "version": "2.9.0",
"bundled": true, "bundled": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
...@@ -5310,10 +5397,10 @@ ...@@ -5310,10 +5397,10 @@
} }
}, },
"minizlib": { "minizlib": {
"version": "1.2.1", "version": "1.3.3",
"bundled": true, "bundled": true,
"requires": { "requires": {
"minipass": "^2.2.1" "minipass": "^2.9.0"
} }
}, },
"mkdirp": { "mkdirp": {
...@@ -5343,7 +5430,7 @@ ...@@ -5343,7 +5430,7 @@
} }
}, },
"node-pre-gyp": { "node-pre-gyp": {
"version": "0.13.0", "version": "0.14.0",
"bundled": true, "bundled": true,
"requires": { "requires": {
"detect-libc": "^1.0.2", "detect-libc": "^1.0.2",
...@@ -5355,7 +5442,7 @@ ...@@ -5355,7 +5442,7 @@
"rc": "^1.2.7", "rc": "^1.2.7",
"rimraf": "^2.6.1", "rimraf": "^2.6.1",
"semver": "^5.3.0", "semver": "^5.3.0",
"tar": "^4" "tar": "^4.4.2"
} }
}, },
"nopt": { "nopt": {
...@@ -5371,7 +5458,7 @@ ...@@ -5371,7 +5458,7 @@
"bundled": true "bundled": true
}, },
"npm-packlist": { "npm-packlist": {
"version": "1.4.4", "version": "1.4.6",
"bundled": true, "bundled": true,
"requires": { "requires": {
"ignore-walk": "^3.0.1", "ignore-walk": "^3.0.1",
...@@ -5528,12 +5615,12 @@ ...@@ -5528,12 +5615,12 @@
"bundled": true "bundled": true
}, },
"tar": { "tar": {
"version": "4.4.10", "version": "4.4.13",
"bundled": true, "bundled": true,
"requires": { "requires": {
"chownr": "^1.1.1", "chownr": "^1.1.1",
"fs-minipass": "^1.2.5", "fs-minipass": "^1.2.5",
"minipass": "^2.3.5", "minipass": "^2.8.6",
"minizlib": "^1.2.1", "minizlib": "^1.2.1",
"mkdirp": "^0.5.0", "mkdirp": "^0.5.0",
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
...@@ -5561,7 +5648,7 @@ ...@@ -5561,7 +5648,7 @@
"integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=" "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE="
}, },
"yallist": { "yallist": {
"version": "3.0.3", "version": "3.1.1",
"bundled": true "bundled": true
}, },
"yargs": { "yargs": {
...@@ -5626,6 +5713,7 @@ ...@@ -5626,6 +5713,7 @@
"version": "1.0.3", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
"dev": true,
"requires": { "requires": {
"function-bind": "^1.1.1" "function-bind": "^1.1.1"
} }
...@@ -5671,7 +5759,8 @@ ...@@ -5671,7 +5759,8 @@
"has-symbols": { "has-symbols": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
"integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=" "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
"dev": true
}, },
"has-value": { "has-value": {
"version": "1.0.0", "version": "1.0.0",
...@@ -6146,11 +6235,6 @@ ...@@ -6146,11 +6235,6 @@
} }
} }
}, },
"is-arguments": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
"integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA=="
},
"is-arrayish": { "is-arrayish": {
"version": "0.2.1", "version": "0.2.1",
"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
...@@ -6175,7 +6259,8 @@ ...@@ -6175,7 +6259,8 @@
"is-callable": { "is-callable": {
"version": "1.1.4", "version": "1.1.4",
"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
"integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==" "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
"dev": true
}, },
"is-data-descriptor": { "is-data-descriptor": {
"version": "0.1.4", "version": "0.1.4",
...@@ -6200,7 +6285,8 @@ ...@@ -6200,7 +6285,8 @@
"is-date-object": { "is-date-object": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
"integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=" "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
"dev": true
}, },
"is-descriptor": { "is-descriptor": {
"version": "0.1.6", "version": "0.1.6",
...@@ -6269,6 +6355,11 @@ ...@@ -6269,6 +6355,11 @@
"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
"dev": true "dev": true
}, },
"is-obj": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
"integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
},
"is-path-cwd": { "is-path-cwd": {
"version": "2.2.0", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz", "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
...@@ -6332,6 +6423,7 @@ ...@@ -6332,6 +6423,7 @@
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz", "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
"integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==", "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
"dev": true,
"requires": { "requires": {
"has-symbols": "^1.0.0" "has-symbols": "^1.0.0"
} }
...@@ -8049,7 +8141,8 @@ ...@@ -8049,7 +8141,8 @@
"minimist": { "minimist": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
"dev": true
}, },
"minipass": { "minipass": {
"version": "2.3.5", "version": "2.3.5",
...@@ -8511,20 +8604,11 @@ ...@@ -8511,20 +8604,11 @@
} }
} }
}, },
"object-inspect": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
"integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="
},
"object-is": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.2.tgz",
"integrity": "sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ=="
},
"object-keys": { "object-keys": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
"dev": true
}, },
"object-visit": { "object-visit": {
"version": "1.0.1", "version": "1.0.1",
...@@ -8535,17 +8619,6 @@ ...@@ -8535,17 +8619,6 @@
"isobject": "^3.0.0" "isobject": "^3.0.0"
} }
}, },
"object.assign": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
"integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
"requires": {
"define-properties": "^1.1.2",
"function-bind": "^1.1.1",
"has-symbols": "^1.0.0",
"object-keys": "^1.0.11"
}
},
"object.getownpropertydescriptors": { "object.getownpropertydescriptors": {
"version": "2.0.3", "version": "2.0.3",
"resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz", "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
...@@ -8566,12 +8639,9 @@ ...@@ -8566,12 +8639,9 @@
} }
}, },
"objectorarray": { "objectorarray": {
"version": "1.0.3", "version": "1.0.4",
"resolved": "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.3.tgz", "resolved": "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.4.tgz",
"integrity": "sha512-kPoflSYkAf/Onvjr4ZLaq37vDuOXjVzfwLCRuORRzYGdXkHa/vacPT0RgR+KmtkwOYFcxTMM62BRrZk8GGKHjw==", "integrity": "sha512-91k8bjcldstRz1bG6zJo8lWD7c6QXcB4nTDUqiEvIL1xAsLoZlOOZZG+nd6YPz+V7zY1580J4Xxh1vZtyv4i/w=="
"requires": {
"tape": "^4.8.0"
}
}, },
"obuf": { "obuf": {
"version": "1.1.2", "version": "1.1.2",
...@@ -8919,7 +8989,8 @@ ...@@ -8919,7 +8989,8 @@
"path-parse": { "path-parse": {
"version": "1.0.6", "version": "1.0.6",
"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
"dev": true
}, },
"path-to-regexp": { "path-to-regexp": {
"version": "0.1.7", "version": "0.1.7",
...@@ -9188,9 +9259,9 @@ ...@@ -9188,9 +9259,9 @@
}, },
"dependencies": { "dependencies": {
"@types/node": { "@types/node": {
"version": "10.17.13", "version": "10.17.17",
"resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.13.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.17.tgz",
"integrity": "sha512-pMCcqU2zT4TjqYFrWtYHKal7Sl30Ims6ulZ4UFXxI4xbtQqK/qqKwkDoBFCfooRqqmRu9vY3xaJRwxSh673aYg==" "integrity": "sha512-gpNnRnZP3VWzzj5k3qrpRC6Rk3H/uclhAVo1aIvwzK5p5cOrs9yEyQ8H/HBsBY0u5rrWxXEiVPQ0dEB6pkjE8Q=="
} }
} }
}, },
...@@ -9638,63 +9709,6 @@ ...@@ -9638,63 +9709,6 @@
"safe-regex": "^1.1.0" "safe-regex": "^1.1.0"
} }
}, },
"regexp.prototype.flags": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz",
"integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==",
"requires": {
"define-properties": "^1.1.3",
"es-abstract": "^1.17.0-next.1"
},
"dependencies": {
"es-abstract": {
"version": "1.17.4",
"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
"integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
"requires": {
"es-to-primitive": "^1.2.1",
"function-bind": "^1.1.1",
"has": "^1.0.3",
"has-symbols": "^1.0.1",
"is-callable": "^1.1.5",
"is-regex": "^1.0.5",
"object-inspect": "^1.7.0",
"object-keys": "^1.1.1",
"object.assign": "^4.1.0",
"string.prototype.trimleft": "^2.1.1",
"string.prototype.trimright": "^2.1.1"
}
},
"es-to-primitive": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
"integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
"requires": {
"is-callable": "^1.1.4",
"is-date-object": "^1.0.1",
"is-symbol": "^1.0.2"
}
},
"has-symbols": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
"integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
},
"is-callable": {
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
"integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="
},
"is-regex": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
"integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
"requires": {
"has": "^1.0.3"
}
}
}
},
"regexpu-core": { "regexpu-core": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz",
...@@ -9842,14 +9856,6 @@ ...@@ -9842,14 +9856,6 @@
"signal-exit": "^3.0.2" "signal-exit": "^3.0.2"
} }
}, },
"resumer": {
"version": "0.0.0",
"resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz",
"integrity": "sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=",
"requires": {
"through": "~2.3.4"
}
},
"ret": { "ret": {
"version": "0.1.15", "version": "0.1.15",
"resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
...@@ -10938,82 +10944,6 @@ ...@@ -10938,82 +10944,6 @@
"resolved": "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz", "resolved": "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz",
"integrity": "sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg==" "integrity": "sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg=="
}, },
"string.prototype.trim": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.1.tgz",
"integrity": "sha512-MjGFEeqixw47dAMFMtgUro/I0+wNqZB5GKXGt1fFr24u3TzDXCPu7J9Buppzoe3r/LqkSDLDDJzE15RGWDGAVw==",
"requires": {
"define-properties": "^1.1.3",
"es-abstract": "^1.17.0-next.1",
"function-bind": "^1.1.1"
},
"dependencies": {
"es-abstract": {
"version": "1.17.4",
"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
"integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
"requires": {
"es-to-primitive": "^1.2.1",
"function-bind": "^1.1.1",
"has": "^1.0.3",
"has-symbols": "^1.0.1",
"is-callable": "^1.1.5",
"is-regex": "^1.0.5",
"object-inspect": "^1.7.0",
"object-keys": "^1.1.1",
"object.assign": "^4.1.0",
"string.prototype.trimleft": "^2.1.1",
"string.prototype.trimright": "^2.1.1"
}
},
"es-to-primitive": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
"integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
"requires": {
"is-callable": "^1.1.4",
"is-date-object": "^1.0.1",
"is-symbol": "^1.0.2"
}
},
"has-symbols": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
"integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
},
"is-callable": {
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
"integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="
},
"is-regex": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
"integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
"requires": {
"has": "^1.0.3"
}
}
}
},
"string.prototype.trimleft": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz",
"integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==",
"requires": {
"define-properties": "^1.1.3",
"function-bind": "^1.1.1"
}
},
"string.prototype.trimright": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz",
"integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==",
"requires": {
"define-properties": "^1.1.3",
"function-bind": "^1.1.1"
}
},
"string_decoder": { "string_decoder": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
...@@ -11123,72 +11053,6 @@ ...@@ -11123,72 +11053,6 @@
"integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==", "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
"dev": true "dev": true
}, },
"tape": {
"version": "4.13.0",
"resolved": "https://registry.npmjs.org/tape/-/tape-4.13.0.tgz",
"integrity": "sha512-J/hvA+GJnuWJ0Sj8Z0dmu3JgMNU+MmusvkCT7+SN4/2TklW18FNCp/UuHIEhPZwHfy4sXfKYgC7kypKg4umbOw==",
"requires": {
"deep-equal": "~1.1.1",
"defined": "~1.0.0",
"dotignore": "~0.1.2",
"for-each": "~0.3.3",
"function-bind": "~1.1.1",
"glob": "~7.1.6",
"has": "~1.0.3",
"inherits": "~2.0.4",
"is-regex": "~1.0.5",
"minimist": "~1.2.0",
"object-inspect": "~1.7.0",
"resolve": "~1.14.2",
"resumer": "~0.0.0",
"string.prototype.trim": "~1.2.1",
"through": "~2.3.8"
},
"dependencies": {
"deep-equal": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
"integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
"requires": {
"is-arguments": "^1.0.4",
"is-date-object": "^1.0.1",
"is-regex": "^1.0.4",
"object-is": "^1.0.1",
"object-keys": "^1.1.1",
"regexp.prototype.flags": "^1.2.0"
}
},
"glob": {
"version": "7.1.6",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
"integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
"requires": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
"inherits": "2",
"minimatch": "^3.0.4",
"once": "^1.3.0",
"path-is-absolute": "^1.0.0"
}
},
"is-regex": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
"integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
"requires": {
"has": "^1.0.3"
}
},
"resolve": {
"version": "1.14.2",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.14.2.tgz",
"integrity": "sha512-EjlOBLBO1kxsUxsKjLt7TAECyKW6fOh1VRkykQkKGzcBbjjPIxBqGh0jf7GJ3k/f5mxMqW3htMD3WdTUVtW8HQ==",
"requires": {
"path-parse": "^1.0.6"
}
}
}
},
"tar": { "tar": {
"version": "4.4.10", "version": "4.4.10",
"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz", "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz",
...@@ -11252,7 +11116,8 @@ ...@@ -11252,7 +11116,8 @@
"through": { "through": {
"version": "2.3.8", "version": "2.3.8",
"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
"dev": true
}, },
"through2": { "through2": {
"version": "2.0.5", "version": "2.0.5",
......
package.json
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
"@ionic-native/core": "^5.19.1", "@ionic-native/core": "^5.19.1",
"@ionic-native/geolocation": "^5.19.1", "@ionic-native/geolocation": "^5.19.1",
"@ionic-native/google-plus": "^5.19.1", "@ionic-native/google-plus": "^5.19.1",
"@ionic-native/keyboard": "^5.21.6",
"@ionic-native/native-geocoder": "^5.19.1", "@ionic-native/native-geocoder": "^5.19.1",
"@ionic-native/navigation-bar": "^5.21.6", "@ionic-native/navigation-bar": "^5.21.6",
"@ionic-native/social-sharing": "^5.20.0", "@ionic-native/social-sharing": "^5.20.0",
...@@ -37,7 +38,7 @@ ...@@ -37,7 +38,7 @@
"@types/googlemaps": "^3.39.2", "@types/googlemaps": "^3.39.2",
"agm-direction": "^0.7.9", "agm-direction": "^0.7.9",
"call-number": "^1.0.1", "call-number": "^1.0.1",
"cordova-android": "8.0.0", "cordova-android": "^8.1.0",
"cordova-plugin-device": "^2.0.3", "cordova-plugin-device": "^2.0.3",
"cordova-plugin-geolocation": "^4.0.2", "cordova-plugin-geolocation": "^4.0.2",
"cordova-plugin-googleplus": "^8.4.0", "cordova-plugin-googleplus": "^8.4.0",
...@@ -51,9 +52,11 @@ ...@@ -51,9 +52,11 @@
"cordova-plugin-x-socialsharing": "^5.6.4", "cordova-plugin-x-socialsharing": "^5.6.4",
"cordova-sqlite-storage": "^3.4.1", "cordova-sqlite-storage": "^3.4.1",
"core-js": "^2.6.11", "core-js": "^2.6.11",
"elementtree": "^0.1.7",
"es6-promise-plugin": "^4.2.2", "es6-promise-plugin": "^4.2.2",
"firebase": "^6.6.2", "firebase": "^7.6.1",
"mx.ferreyra.callnumber": "0.0.2", "mx.ferreyra.callnumber": "0.0.2",
"properties-parser": "^0.3.1",
"rxjs": "^6.5.4", "rxjs": "^6.5.4",
"rxjs-compat": "^6.5.4", "rxjs-compat": "^6.5.4",
"tslib": "^1.9.0", "tslib": "^1.9.0",
......
src/app/app.module.ts
...@@ -32,6 +32,7 @@ import { SearchmodalPageModule } from './searchmodal/searchmodal.module'; ...@@ -32,6 +32,7 @@ import { SearchmodalPageModule } from './searchmodal/searchmodal.module';
import { SocialSharing } from '@ionic-native/social-sharing/ngx'; import { SocialSharing } from '@ionic-native/social-sharing/ngx';
import { CallNumber } from '@ionic-native/call-number/ngx'; import { CallNumber } from '@ionic-native/call-number/ngx';
import { sanitizeHtmlPipe } from './../config/safehtml'; import { sanitizeHtmlPipe } from './../config/safehtml';
import { Keyboard } from '@ionic-native/keyboard/ngx';
@NgModule({ @NgModule({
declarations: [AppComponent], declarations: [AppComponent],
...@@ -62,7 +63,8 @@ import { sanitizeHtmlPipe } from './../config/safehtml'; ...@@ -62,7 +63,8 @@ import { sanitizeHtmlPipe } from './../config/safehtml';
GooglePlus, GooglePlus,
SocialSharing, SocialSharing,
sanitizeHtmlPipe, sanitizeHtmlPipe,
NavigationBar NavigationBar,
Keyboard
], ],
bootstrap: [AppComponent] bootstrap: [AppComponent]
}) })
......
src/app/catstorelist/catstorelist.page.html
...@@ -55,4 +55,10 @@ ...@@ -55,4 +55,10 @@
</div> </div>
</div> </div>
</div> </div>
<div class="loader" *ngIf="loader">
<div class="lds-ripple">
<div></div>
<div></div>
</div>
</div>
</ion-content> </ion-content>
\ No newline at end of file
src/app/catstorelist/catstorelist.page.scss
.home_wrapper { .home_wrapper {
width: 100%;
.home_banner {
width: 100%; width: 100%;
height: 300px; padding-bottom: 50px;
padding-top: 80px; .home_banner {
position: relative;
background-color: #fff;
.home_banner_title {
padding: 10px;
position: absolute;
top: 0px;
left: 0px;
right: 0px;
img {
width: 100px;
}
p {
margin: 0px;
text-align: right;
background-image: url('../../assets/Path 55_2.png');
background-position: left;
background-repeat: no-repeat;
background-size: 12px;
padding-left: 20px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
}
ion-slides {
width: 100%;
height: 100%;
ion-slide {
width: 100%; width: 100%;
height: 100%; height: 300px;
padding-top: 80px;
position: relative; position: relative;
img { background-color: #fff;
width: 100%; .home_banner_title {
height: 100%; padding: 10px;
object-fit: cover; position: absolute;
top: 0px;
left: 0px;
right: 0px;
img {
width: 100px;
}
p {
margin: 0px;
text-align: right;
background-image: url('../../assets/Path 55_2.png');
background-position: left;
background-repeat: no-repeat;
background-size: 12px;
padding-left: 20px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
} }
.banner_slide { ion-slides {
position: absolute; width: 100%;
top: 0px; height: 100%;
left: 0px; ion-slide {
right: 0px; width: 100%;
bottom: 0px; height: 100%;
-webkit-box-shadow: inset 0px -128px 63px -45px rgba(0, 0, 0, 0.75); position: relative;
-moz-box-shadow: inset 0px -128px 63px -45px rgba(0, 0, 0, 0.75); img {
box-shadow: inset 0px -128px 63px -45px rgba(0, 0, 0, 0.75); width: 100%;
padding-top: 160px; height: 100%;
padding-left: 20px; object-fit: cover;
padding-right: 20px; }
h5 { .banner_slide {
color: #fff; position: absolute;
margin: 0px; top: 0px;
padding: 0px; left: 0px;
text-align: left; right: 0px;
font-weight: bold; bottom: 0px;
letter-spacing: 2px; -webkit-box-shadow: inset 0px -128px 63px -45px rgba(0, 0, 0, 0.75);
padding-bottom: 5px; -moz-box-shadow: inset 0px -128px 63px -45px rgba(0, 0, 0, 0.75);
font-size: 14px; box-shadow: inset 0px -128px 63px -45px rgba(0, 0, 0, 0.75);
overflow: hidden; padding-top: 160px;
white-space: nowrap; padding-left: 20px;
text-overflow: ellipsis; padding-right: 20px;
} h5 {
p { color: #fff;
color: #fff; margin: 0px;
margin: 0px; padding: 0px;
padding: 0px; text-align: left;
text-align: left; font-weight: bold;
font-size: 20px; letter-spacing: 2px;
font-weight: lighter; padding-bottom: 5px;
overflow: hidden; font-size: 14px;
white-space: nowrap; overflow: hidden;
text-overflow: ellipsis; white-space: nowrap;
} text-overflow: ellipsis;
}
p {
color: #fff;
margin: 0px;
padding: 0px;
text-align: left;
font-size: 20px;
font-weight: lighter;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
}
}
} }
}
} }
} .home_sub_header {
.home_sub_header { padding: 10px;
padding: 10px; padding-top: 20px;
padding-top: 20px; padding-bottom: 20px;
padding-bottom: 20px; color: rgba(59, 57, 77, 1);
color: rgba(59, 57, 77, 1); font-weight: 900;
font-weight: 900;
}
.featured_slider {
padding-left: 10px;
padding-right: 10px;
.feature_product {
width: 100%;
height: 130px;
position: relative;
background-color: #a8a8a8;
border: 2px solid #fff;
img {
width: 100%;
height: 100%;
object-fit: cover;
object-position: center;
}
.feature_overlay {
position: absolute;
top: 0px;
left: 0px;
right: 0px;
bottom: 0px;
background-color: rgba(0, 0, 0, 0.75);
padding: 15px;
padding-top: 60px;
h5 {
color: #fff;
margin: 0px;
padding: 0px;
text-align: left;
font-weight: bold;
letter-spacing: 2px;
padding-bottom: 2px;
font-size: 14px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
p {
color: #fff;
margin: 0px;
padding: 0px;
text-align: left;
font-size: 20px;
font-weight: lighter;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
}
} }
} .featured_slider {
.nearby_shop_list { padding-left: 10px;
ul { padding-right: 10px;
margin: 0px; .feature_product {
padding-left: 10px;
padding-right: 10px;
li {
list-style: none;
padding-bottom: 10px;
.nearby_image {
width: 120px;
height: 125px;
float: left;
background-color: #a8a8a8;
border-radius: 8px;
img {
width: 100%; width: 100%;
height: 100%; height: 130px;
object-fit: cover; position: relative;
object-position: center; background-color: #a8a8a8;
} border: 2px solid #fff;
img {
width: 100%;
height: 100%;
object-fit: cover;
object-position: center;
}
.feature_overlay {
position: absolute;
top: 0px;
left: 0px;
right: 0px;
bottom: 0px;
background-color: rgba(0, 0, 0, 0.75);
padding: 15px;
padding-top: 60px;
h5 {
color: #fff;
margin: 0px;
padding: 0px;
text-align: left;
font-weight: bold;
letter-spacing: 2px;
padding-bottom: 2px;
font-size: 14px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
p {
color: #fff;
margin: 0px;
padding: 0px;
text-align: left;
font-size: 20px;
font-weight: lighter;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
}
} }
.nearby_detail { }
width: calc(100% - 120px); .nearby_shop_list {
float: left; ul {
padding-left: 20px;
padding-top: 40px;
h5 {
margin: 0px; margin: 0px;
padding: 0px; padding-left: 10px;
color: rgba(59, 57, 77, 1); padding-right: 10px;
font-weight: 900; li {
padding-bottom: 2px; list-style: none;
overflow: hidden; padding-bottom: 10px;
white-space: nowrap; .nearby_image {
text-overflow: ellipsis; width: 120px;
img { height: 125px;
width: 16px; float: left;
border-radius: 8px;
img {
width: 100%;
height: 100%;
object-fit: contain;
object-position: center;
}
}
.nearby_detail {
width: calc(100% - 120px);
float: left;
padding-left: 20px;
padding-top: 40px;
h5 {
margin: 0px;
padding: 0px;
color: rgba(59, 57, 77, 1);
font-weight: 900;
padding-bottom: 2px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
img {
width: 16px;
}
}
p {
margin: 0px;
padding: 0px;
color: rgb(176, 174, 199);
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
}
} }
} }
p { }
.featured_catagory_list {
padding: 10px;
ul {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
color: rgb(176, 174, 199); li {
overflow: hidden; list-style: none;
white-space: nowrap; position: relative;
text-overflow: ellipsis; height: 120px;
} width: 100%;
border-radius: 8px;
margin-bottom: 10px;
&:nth-child(odd) {
text-align: left;
}
&:nth-child(even) {
text-align: right;
}
img {
width: 100%;
height: 100%;
object-fit: cover;
object-position: center;
}
.featured_overlay {
position: absolute;
top: 0px;
left: 0px;
right: 0px;
bottom: 0px;
border-radius: 8px;
background-color: rgba(0, 0, 0, 0.75);
color: #fff;
padding: 45px;
padding-left: 20px;
padding-right: 20px;
h4 {
margin: 0px;
font-size: 26px;
font-weight: 900;
}
}
}
} }
}
} }
} }
.featured_catagory_list {
padding: 10px; .sort_wrappper {
ul { height: 100vh;
margin: 0px; width: 100%;
padding: 0px; position: fixed;
li { top: 0px;
list-style: none; left: 0px;
right: 0px;
bottom: 0px;
background: rgba(0, 0, 0, 0.6);
z-index: 99;
.sort_inner {
margin: 0 auto;
width: 90%;
padding: 10px;
padding-left: 15px;
padding-right: 15px;
padding-bottom: 15px;
background-color: #fff;
position: relative; position: relative;
height: 120px; -webkit-box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.3);
width: 100%; -moz-box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.3);
border-radius: 8px; box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.3);
margin-bottom: 10px; top: 25%;
&:nth-child(odd) { border-radius: 0px;
text-align: left; h4 {
text-align: center;
color: rgba(59, 57, 77, 1);
margin: 0px;
font-weight: bold;
padding: 10px;
font-size: 18px;
border-bottom: 1px solid rgba(0, 0, 0, 0.16);
padding-bottom: 20px;
margin-bottom: 30px;
} }
&:nth-child(even) { .search_box {
text-align: right; width: calc(100% - 100px);
height: 45px;
border: none;
border-bottom: 1px solid rgba(0, 0, 0, 0.16);
} }
img { .search_btn {
width: 100%; width: 100px;
height: 100%; height: 45px;
object-fit: cover; background-color: rgba(41, 40, 91, 1);
object-position: center; border: none;
color: #fff;
font-size: 16px;
} }
.featured_overlay { ul {
position: absolute;
top: 0px;
left: 0px;
right: 0px;
bottom: 0px;
border-radius: 8px;
background-color: rgba(0, 0, 0, 0.75);
color: #fff;
padding: 45px;
padding-left: 20px;
padding-right: 20px;
h4 {
margin: 0px; margin: 0px;
font-size: 26px; padding: 0px;
font-weight: 900; li {
} list-style: none;
border-bottom: 1px solid rgba(0, 0, 0, 0.16);
padding-top: 10px;
padding-bottom: 10px;
.styled-checkbox {
position: absolute; // take it out of document flow
opacity: 0; // hide it
&+label {
position: relative;
cursor: pointer;
padding: 0;
width: 100%;
}
// Box.
&+label:before {
content: '';
margin-right: 10px;
display: inline-block;
vertical-align: text-top;
width: 20px;
height: 20px;
border-radius: 5px;
background: white;
border: 1px solid rgba(215, 213, 228, 1);
}
&:checked+label:before {
background: #29285b;
}
// Disabled state label.
&:disabled+label {
color: #b8b8b8;
cursor: auto;
}
// Disabled box.
&:disabled+label:before {
box-shadow: none;
background: #ddd;
}
// Checkmark. Could be replaced with an image
&:checked+label:after {
content: '';
position: absolute;
left: 6px;
top: 10px;
background: white;
width: 2px;
height: 2px;
box-shadow: 2px 0 0 white, 4px 0 0 white, 4px -2px 0 white, 4px -4px 0 white, 4px -6px 0 white, 4px -8px 0 white;
transform: rotate(45deg);
}
}
}
}
.sort_footer {
padding-top: 10px;
button {
border-radius: 8px;
height: 40px;
width: 48%;
color: #fff;
font-size: 15px;
font-weight: lighter;
}
.submit {
background-color: rgba(41, 40, 91, 1);
}
.cancel {
background-color: rgba(215, 213, 228, 1);
}
} }
}
} }
}
} }
.sort_wrappper { .no-result-wrapper {
height: 100vh; text-align: center;
width: 100%; img {
position: fixed; width: 100px;
top: 0px;
left: 0px;
right: 0px;
bottom: 0px;
background: rgba(0, 0, 0, 0.6);
z-index: 99;
.sort_inner {
margin: 0 auto;
width: 90%;
padding: 10px;
padding-left: 15px;
padding-right: 15px;
padding-bottom: 15px;
background-color: #fff;
position: relative;
-webkit-box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.3);
-moz-box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.3);
box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.3);
top: 25%;
border-radius: 0px;
h4 {
text-align: center;
color: rgba(59, 57, 77, 1);
margin: 0px;
font-weight: bold;
padding: 10px;
font-size: 18px;
border-bottom: 1px solid rgba(0, 0, 0, 0.16);
padding-bottom: 20px;
margin-bottom: 30px;
}
.search_box {
width: calc(100% - 100px);
height: 45px;
border: none;
border-bottom: 1px solid rgba(0, 0, 0, 0.16);
} }
.search_btn { h1 {
width: 100px; font-size: 18px;
height: 45px; font-weight: bolder;
background-color: rgba(41, 40, 91, 1); text-transform: uppercase;
border: none; color: #3b394d;
color: #fff;
font-size: 16px;
} }
ul { button {
margin: 0px; background-color: #29285b;
padding: 0px;
li {
list-style: none;
border-bottom: 1px solid rgba(0, 0, 0, 0.16);
padding-top: 10px;
padding-bottom: 10px;
.styled-checkbox {
position: absolute; // take it out of document flow
opacity: 0; // hide it
& + label {
position: relative;
cursor: pointer;
padding: 0;
width: 100%;
}
// Box.
& + label:before {
content: '';
margin-right: 10px;
display: inline-block;
vertical-align: text-top;
width: 20px;
height: 20px;
border-radius: 5px;
background: white;
border: 1px solid rgba(215, 213, 228, 1);
}
&:checked + label:before {
background: #29285b;
}
// Disabled state label.
&:disabled + label {
color: #b8b8b8;
cursor: auto;
}
// Disabled box.
&:disabled + label:before {
box-shadow: none;
background: #ddd;
}
// Checkmark. Could be replaced with an image
&:checked + label:after {
content: '';
position: absolute;
left: 6px;
top: 10px;
background: white;
width: 2px;
height: 2px;
box-shadow: 2px 0 0 white, 4px 0 0 white, 4px -2px 0 white,
4px -4px 0 white, 4px -6px 0 white, 4px -8px 0 white;
transform: rotate(45deg);
}
}
}
}
.sort_footer {
padding-top: 10px;
button {
border-radius: 8px; border-radius: 8px;
height: 40px; height: 50px;
width: 48%; width: 48%;
color: #fff; color: #fff;
font-size: 15px; font-size: 18px;
font-weight: lighter; font-weight: lighter;
} text-transform: uppercase;
.submit { margin-top: 10px;
background-color: rgba(41, 40, 91, 1);
}
.cancel {
background-color: rgba(215, 213, 228, 1);
}
} }
} }
} \ No newline at end of file
.no-result-wrapper {
text-align: center;
img {
width: 100px;
}
h1 {
font-size: 18px;
font-weight: bolder;
text-transform: uppercase;
color: #3b394d;
}
button {
background-color: #29285b;
border-radius: 8px;
height: 50px;
width: 48%;
color: #fff;
font-size: 18px;
font-weight: lighter;
text-transform: uppercase;
margin-top: 10px;
}
}
src/app/catstorelist/catstorelist.page.ts
...@@ -31,6 +31,7 @@ export class CatStorelistPage implements OnInit { ...@@ -31,6 +31,7 @@ export class CatStorelistPage implements OnInit {
slidesPerView: 1.5 slidesPerView: 1.5
}; };
data: any; data: any;
loader: boolean;
constructor( constructor(
public router: Router, public router: Router,
...@@ -41,15 +42,19 @@ export class CatStorelistPage implements OnInit { ...@@ -41,15 +42,19 @@ export class CatStorelistPage implements OnInit {
private modalController: ModalController, private modalController: ModalController,
private subjectService: SubjectService private subjectService: SubjectService
) { ) {
this.loader = true;
this.service.get('catParams').then(val => { this.service.get('catParams').then(val => {
this.data = val; this.data = val;
if (this.data.catId === '0') { if (this.data.catId === '0') {
this.shopperService.shopperList(true, 'status'); this.shopperService.shopperList(true, 'status');
} else { } else {
console.log('error'); this.shopperService.categoryShopperList(this.data.catId);
this.shopperService.shopperList(this.data.catId, 'catId');
} }
}); });
const This = this;
setTimeout(() => {
This.loader = false;
}, 2000);
} }
async clickSearch() { async clickSearch() {
......
src/app/changedetails/changedetails.page.ts
...@@ -47,7 +47,7 @@ export class ChangedetailsPage implements OnInit { ...@@ -47,7 +47,7 @@ export class ChangedetailsPage implements OnInit {
// }); // });
} }
ngOnInit() {} ngOnInit() { }
goToPage(path, data = null) { goToPage(path, data = null) {
this.router.navigateByUrl(path, { queryParams: data }); this.router.navigateByUrl(path, { queryParams: data });
...@@ -68,7 +68,7 @@ export class ChangedetailsPage implements OnInit { ...@@ -68,7 +68,7 @@ export class ChangedetailsPage implements OnInit {
form.value.password && form.value.password &&
form.value.password === form.value.confirmPassword form.value.password === form.value.confirmPassword
) { ) {
this.register.updateData(form.value, this.userData.uid); this.register.updateData(form.value, this.userData);
this.register.updatePassword( this.register.updatePassword(
form.value.currentPassword, form.value.currentPassword,
form.value.password form.value.password
......
src/app/forgot/forgot.page.html
<div class="nav_header"> <div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()"> <button class="nav_btn nav_back floatLeft" (click)="goToPage('login')">
<img src="../assets/Group17_2.png" /> <img src="../assets/Group17_2.png" />
</button> </button>
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4>FORGOT PASSWORD</h4> <h4>FORGOT PASSWORD</h4>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<ion-content> <ion-content>
<div class="verification_div"> <div class="verification_div">
<div class="form_div"> <div class="form_div">
<div class="row"> <div class="row">
<input class="" type="email" placeholder="Type your email Id" #emailId required /> <input class="" type="email" placeholder="Type your email Id" #emailId required />
</div> </div>
<div class="row"> <div class="row">
<button class="login_btn" (click)="authService.resetPassword(emailId.value);"> <button class="login_btn" (click)="authService.resetPassword(emailId.value);">
RESET PASSWORD RESET PASSWORD
</button> </button>
</div> </div>
</div>
</div> </div>
</div>
</ion-content> </ion-content>
<div class="loader" *ngIf="authService.loader"> <div class="loader" *ngIf="authService.loader">
<div class="lds-ripple"> <div class="lds-ripple">
<div></div> <div></div>
<div></div> <div></div>
</div> </div>
</div> </div>
\ No newline at end of file
src/app/home/home.page.html
...@@ -66,9 +66,9 @@ ...@@ -66,9 +66,9 @@
</div> </div>
<div class="home_sub_header"> <div class="home_sub_header">
<span class="floatLeft">Nearby Shopping Centers</span> <span class="floatLeft">Nearby Shopping Centers</span>
<span class="floatRight"> <!-- <span class="floatRight">
<div class="nearby_icon" (click)="goToPage('nearby')"></div> <div class="nearby_icon" (click)="goToPage('nearby')"></div>
</span> </span> -->
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div class="nearby_shop_list"> <div class="nearby_shop_list">
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
</ul> </ul>
</div> </div>
<div class="home_sub_header"> <div class="home_sub_header">
Featured Catagories Featured Categories
</div> </div>
<div class="featured_catagory_list"> <div class="featured_catagory_list">
<ul *ngIf="categoriesService.activecategories && categoriesService.activecategories.length > 0"> <ul *ngIf="categoriesService.activecategories && categoriesService.activecategories.length > 0">
...@@ -122,10 +122,16 @@ ...@@ -122,10 +122,16 @@
<ion-content class="sort_wrappper"> <ion-content class="sort_wrappper">
<agm-map [zoom]="20" [latitude]="lat" [longitude]="lng" [disableDefaultUI]="false" [zoomControl]="false" <agm-map [zoom]="20" [latitude]="lat" [longitude]="lng" [disableDefaultUI]="false" [zoomControl]="false"
[backgroundColor]="'rgba(29, 27, 130,0.2)'"> [backgroundColor]="'rgba(29, 27, 130,0.2)'">
<agm-marker [latitude]="lat" [longitude]="lng"></agm-marker> <agm-marker [latitude]="lat" [longitude]="lng" [iconUrl]="
{
url: './assets/pin.svg',
scaledSize: {
width: 28,
height: 40
}}"></agm-marker>
</agm-map> </agm-map>
<div class="add_address_wrapper"> <div class="add_address_wrapper">
<h5 class="floatLeft">NEW ADDRESS</h5> <h5 class="floatLeft">ADDRESS LIST</h5>
<h5 class="floatRight" (click)="istoggle(); goToPage('nearby')"> <h5 class="floatRight" (click)="istoggle(); goToPage('nearby')">
ADD NEW ADD NEW
</h5> </h5>
......
src/app/home/home.page.ts
...@@ -104,7 +104,7 @@ export class HomePage implements OnInit { ...@@ -104,7 +104,7 @@ export class HomePage implements OnInit {
console.log(status); console.log(status);
if (status === 'OK') { if (status === 'OK') {
if (results[0]) { if (results[0]) {
const addressData = results[0].formatted_address.split(', '); const addressData = results[1].formatted_address.split(', ');
this.address = addressData[0] + ', ' + addressData[1]; this.address = addressData[0] + ', ' + addressData[1];
console.log(this.address); console.log(this.address);
} else { } else {
...@@ -119,15 +119,27 @@ export class HomePage implements OnInit { ...@@ -119,15 +119,27 @@ export class HomePage implements OnInit {
setDefault(address: any) { setDefault(address: any) {
this.loader = true; this.loader = true;
this.addressService.setDefaultAddress(address.addressId, this.custId).then(() => { this.addressService
this.address = address.address; .setDefaultAddress(address.addressId, this.custId)
console.log(address.latLng); .then(() => {
this.centerService.getNearBy(address.latLng._lat, address.latLng._long, this.service.distance); this.address = address.address;
this.loader = false; console.log(address.latLng);
}).catch(err => { this.centerService.getNearBy(
this.loader = false; address.latLng._lat,
this.service.showToast('Something went wrong please try again!', 'top', 'my-error', 1000); address.latLng._long,
}); this.service.distance
);
this.loader = false;
})
.catch(err => {
this.loader = false;
this.service.showToast(
'Something went wrong please try again!',
'top',
'my-error',
1000
);
});
} }
clickSearch() { clickSearch() {
...@@ -153,7 +165,6 @@ export class HomePage implements OnInit { ...@@ -153,7 +165,6 @@ export class HomePage implements OnInit {
} else if (path === 'catstorelist') { } else if (path === 'catstorelist') {
this.service.set('catParams', data); this.service.set('catParams', data);
} else { } else {
} }
this.router.navigateByUrl(path, { queryParams: data }); this.router.navigateByUrl(path, { queryParams: data });
document.body.scrollTop = document.documentElement.scrollTop = 0; document.body.scrollTop = document.documentElement.scrollTop = 0;
......
src/app/nearby/nearby.page.html
<div class="nav_header"> <div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()" *ngIf="authService.regState"> <button class="nav_btn nav_back floatLeft" (click)="goBack()" *ngIf="authService.regState">
<img src="../assets/Group17_2.png" /> <img src="../assets/Group17_2.png" />
</button> </button>
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4>NEAR BY STORES</h4> <h4>NEW ADDRESS</h4>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<ion-content> <ion-content>
<div class="nearby_map"> <div class="nearby_map">
<agm-map [latitude]="latitude" [longitude]="longitude" [zoom]="8" [backgroundColor]="'rgba(29, 27, 130,0.2)'"> <agm-map [latitude]="latitude" [longitude]="longitude" [zoom]="8" [backgroundColor]="'rgba(29, 27, 130,0.2)'">
<agm-marker [latitude]="latitude" [longitude]="longitude" [markerDraggable]="true" <agm-marker [latitude]="latitude" [longitude]="longitude" [markerDraggable]="true" (dragEnd)="markerDragEnd($event)" [iconUrl]="
(dragEnd)="markerDragEnd($event)"></agm-marker> {
</agm-map> url: './assets/pin.svg',
<form (ngSubmit)="onSubmit(addressForm.value); addressForm.reset()" #addressForm="ngForm" method="post" scaledSize: {
class="form-horizontal"> width: 28,
<div class="add_address_wrapper"> height: 40
<h5>DELIVERY</h5> }}"></agm-marker>
<p>{{address}}</p> </agm-map>
<input [(ngModel)]="addressForm.building" name="building" #building="ngModel" name="building" required <form (ngSubmit)="onSubmit(addressForm.value); addressForm.reset()" #addressForm="ngForm" method="post" class="form-horizontal">
placeholder="House No./ Building No" /> <div class="add_address_wrapper">
<div class="md-errors-spacer" [hidden]="building.valid || landmark.pristine" class="ion-padding-start"> <h5>DELIVERY</h5>
Building Name is required <p>{{address}}</p>
</div> <input [(ngModel)]="addressForm.building" name="building" #building="ngModel" name="building" required placeholder="House No./ Building No" />
<input [(ngModel)]="addressForm.landmark" name="landmark" #landmark="ngModel" name="landmark" required <div class="md-errors-spacer" [hidden]="building.valid || landmark.pristine" class="ion-padding-start">
placeholder="Landmark" /> Building Name is required
<div class="md-errors-spacer" [hidden]="landmark.valid || landmark.pristine" class="ion-padding-start"> </div>
Landmark is required <input [(ngModel)]="addressForm.landmark" name="landmark" #landmark="ngModel" name="landmark" required placeholder="Landmark" />
<div class="md-errors-spacer" [hidden]="landmark.valid || landmark.pristine" class="ion-padding-start">
Landmark is required
</div>
<ion-grid>
<ion-row>
<ion-col>
<h6>
<input class="styled-checkbox" id="styled-check-1" type="radio" value="Home" [(ngModel)]="addressForm.addressType" name="addressType" #addressType="ngModel" required />
<label for="styled-check-1"><span>Home</span></label>
</h6>
</ion-col>
<ion-col>
<h6>
<input class="styled-checkbox" id="styled-check-2" type="radio" value="Work" [(ngModel)]="addressForm.addressType" name="addressType" #addressType="ngModel" required />
<label for="styled-check-2"><span>Office</span></label>
</h6>
</ion-col>
<ion-col>
<h6>
<input class="styled-checkbox" id="styled-check-3" type="radio" value="Other" [(ngModel)]="addressForm.addressType" name="addressType" #addressType="ngModel" required />
<label for="styled-check-3"><span>Others</span></label>
</h6>
</ion-col>
</ion-row>
<div class="md-errors-spacer" [hidden]="addressType.valid || addressType.pristine" class="ion-padding-start">
Address Type is required
</div>
</ion-grid>
<button class="add_btn" type="submit" [disabled]="!addressForm.form.valid">
ADD
</button>
</div>
</form>
</div>
<div class="loader" *ngIf="loader">
<div class="lds-ripple">
<div></div>
<div></div>
</div> </div>
<ion-grid>
<ion-row>
<ion-col>
<h6>
<input class="styled-checkbox" id="styled-check-1" type="radio" value="Home"
[(ngModel)]="addressForm.addressType" name="addressType" #addressType="ngModel" required />
<label for="styled-check-1"><span>Home</span></label>
</h6>
</ion-col>
<ion-col>
<h6>
<input class="styled-checkbox" id="styled-check-2" type="radio" value="Work"
[(ngModel)]="addressForm.addressType" name="addressType" #addressType="ngModel" required />
<label for="styled-check-2"><span>Office</span></label>
</h6>
</ion-col>
<ion-col>
<h6>
<input class="styled-checkbox" id="styled-check-3" type="radio" value="Other"
[(ngModel)]="addressForm.addressType" name="addressType" #addressType="ngModel" required />
<label for="styled-check-3"><span>Others</span></label>
</h6>
</ion-col>
</ion-row>
<div class="md-errors-spacer" [hidden]="addressType.valid || addressType.pristine" class="ion-padding-start">
Address Type is required
</div>
</ion-grid>
<button class="add_btn" type="submit" [disabled]="!addressForm.form.valid">
ADD
</button>
</div>
</form>
</div>
<div class="loader" *ngIf="loader">
<div class="lds-ripple">
<div></div>
<div></div>
</div> </div>
</div>
</ion-content> </ion-content>
\ No newline at end of file
src/app/nearby/nearby.page.scss
.nearby_map { .nearby_map {
width: 100%;
height: 100%;
.overlay {
position: absolute;
top: 0px;
left: 0px;
right: 0px;
bottom: 0px;
background: rgba(29, 27, 130, 0.2);
}
agm-map {
width: 100%; width: 100%;
height: 100vh; height: 100%;
.overlay { .overlay {
position: absolute; position: absolute;
top: 0px; top: 0px;
...@@ -22,112 +11,144 @@ ...@@ -22,112 +11,144 @@
} }
agm-map { agm-map {
width: 100%; width: 100%;
height: 100%; height: calc(100% - 330px);
position: relative; .overlay {
position: absolute;
top: 0px;
left: 0px;
right: 0px;
bottom: 0px;
background: rgba(29, 27, 130, 0.2);
}
agm-map {
width: 100%;
height: 100%;
position: relative;
}
.click_marker {
min-width: 200px;
padding: 10px;
h5 {
margin: 0px;
padding: 0px;
}
p {
margin: 0px;
padding: 0px;
}
}
} }
.click_marker { .add_address_wrapper {
min-width: 200px; position: fixed;
padding: 10px; bottom: 0px;
left: 0px;
right: 0px;
padding: 20px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
background: #fff;
-webkit-box-shadow: 0px -2px 5px 0px rgba(0, 0, 0, 0.2);
-moz-box-shadow: 0px -2px 5px 0px rgba(0, 0, 0, 0.2);
box-shadow: 0px -2px 5px 0px rgba(0, 0, 0, 0.2);
h5 { h5 {
color: rgba(41, 40, 91, 1);
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
font-weight: 800;
} }
p { input {
margin: 0px; width: 100%;
padding: 0px; height: 45px;
border: 1px solid #e1e0eb;
border-radius: 4px;
padding-left: 10px;
padding-right: 10px;
margin-bottom: 20px;
outline: none;
transition: all 0.4s ease-in-out;
&::placeholder {
color: rgba(215, 213, 228, 1);
}
&:focus {
border: 1px solid #f3d09f;
box-shadow: 3px 3px 6px 0px rgba(202, 154, 83, 0.11);
}
}
.add_btn {
width: 100%;
height: 45px;
background-color: #29285b;
color: #fff;
border-radius: 4px;
} }
} }
} .styled-checkbox {
.add_address_wrapper { position: absolute; // take it out of document flow
position: fixed; opacity: 0; // hide it
bottom: 0px; &+label {
left: 0px; position: relative;
right: 0px; cursor: pointer;
padding: 20px; padding: 0;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
background: #fff;
-webkit-box-shadow: 0px -2px 5px 0px rgba(0, 0, 0, 0.2);
-moz-box-shadow: 0px -2px 5px 0px rgba(0, 0, 0, 0.2);
box-shadow: 0px -2px 5px 0px rgba(0, 0, 0, 0.2);
h5 {
color: rgba(41, 40, 91, 1);
margin: 0px;
padding: 0px;
font-weight: 800;
}
input {
width: 100%;
height: 45px;
border: 1px solid #e1e0eb;
border-radius: 4px;
padding-left: 10px;
padding-right: 10px;
margin-bottom: 20px;
outline: none;
transition: all 0.4s ease-in-out;
&::placeholder {
color: rgba(215, 213, 228, 1);
} }
&:focus { // Box.
border: 1px solid #f3d09f; &+label:before {
box-shadow: 3px 3px 6px 0px rgba(202, 154, 83, 0.11); content: '';
margin-right: 10px;
display: inline-block;
vertical-align: text-top;
width: 20px;
height: 20px;
border-radius: 10px;
background: white;
border: 1px solid rgba(215, 213, 228, 1);
}
// Box hover
// Box checked
&:checked+label:before {
background: #29285b;
}
// Disabled state label.
&:disabled+label {
color: #b8b8b8;
cursor: auto;
}
// Disabled box.
&:disabled+label:before {
box-shadow: none;
background: #ddd;
}
// Checkmark. Could be replaced with an image
&:checked+label:after {
content: '';
position: absolute;
left: 6px;
top: 11px;
background: white;
width: 2px;
height: 2px;
box-shadow: 2px 0 0 white, 4px 0 0 white, 4px -2px 0 white, 4px -4px 0 white, 4px -6px 0 white, 4px -8px 0 white;
transform: rotate(45deg);
} }
}
.add_btn {
width: 100%;
height: 45px;
background-color: #29285b;
color: #fff;
border-radius: 4px;
} }
} }
.styled-checkbox {
position: absolute; // take it out of document flow @media only screen and (max-width: 350px) {
opacity: 0; // hide it .nearby_map {
&+label { .add_address_wrapper {
position: relative; padding: 10px 20px !important;
cursor: pointer; p {
padding: 0; margin: 2px 0;
} }
// Box. input {
&+label:before { margin-bottom: 5px;
content: ''; }
margin-right: 10px; h6 {
display: inline-block; margin: 0;
vertical-align: text-top; }
width: 20px; }
height: 20px; agm-map {
border-radius: 10px; width: 100%;
background: white; height: calc(100% - 235px);
border: 1px solid rgba(215, 213, 228, 1); }
}
// Box hover
// Box checked
&:checked+label:before {
background: #29285b;
}
// Disabled state label.
&:disabled+label {
color: #b8b8b8;
cursor: auto;
}
// Disabled box.
&:disabled+label:before {
box-shadow: none;
background: #ddd;
}
// Checkmark. Could be replaced with an image
&:checked+label:after {
content: '';
position: absolute;
left: 6px;
top: 11px;
background: white;
width: 2px;
height: 2px;
box-shadow: 2px 0 0 white, 4px 0 0 white, 4px -2px 0 white, 4px -4px 0 white, 4px -6px 0 white, 4px -8px 0 white;
transform: rotate(45deg);
} }
} }
} \ No newline at end of file
\ No newline at end of file
src/app/productdetail/productdetail.page.ts
...@@ -25,6 +25,7 @@ export class ProductdetailPage implements OnInit { ...@@ -25,6 +25,7 @@ export class ProductdetailPage implements OnInit {
data: any; data: any;
slideData: any[]; slideData: any[];
loader: boolean; loader: boolean;
custId: any;
bannerOptions = { bannerOptions = {
slidesPerView: 1, slidesPerView: 1,
...@@ -70,6 +71,7 @@ export class ProductdetailPage implements OnInit { ...@@ -70,6 +71,7 @@ export class ProductdetailPage implements OnInit {
const users = this.service.get('user').then(data => { const users = this.service.get('user').then(data => {
if (data) { if (data) {
data = JSON.parse(data); data = JSON.parse(data);
this.custId = data.uid;
const This = this; const This = this;
this.cartService.cartList(data.uid); this.cartService.cartList(data.uid);
} }
...@@ -171,16 +173,16 @@ export class ProductdetailPage implements OnInit { ...@@ -171,16 +173,16 @@ export class ProductdetailPage implements OnInit {
} }
changeFav(index) { changeFav(index) {
this.prodService.changeFav(index, 'yes'); this.prodService.changeFav(index, 'yes', this.custId);
const state = this.prodService.fav.findIndex(x => x === index); const state = this.prodService.fav.findIndex(x => x === index);
// console.log(state); // console.log(state);
// console.log(this.prodService.fav); // console.log(this.prodService.fav);
if (state > -1) { if (state > -1) {
this.prodService.fav.splice(state, 1); this.prodService.fav.splice(state, 1);
this.prodService.changeFav(index, 'yes'); this.prodService.changeFav(index, 'yes', this.custId);
} else { } else {
this.prodService.fav.push(index); this.prodService.fav.push(index);
this.prodService.changeFav(index, 'no'); this.prodService.changeFav(index, 'no', this.custId);
} }
return; return;
// console.log(this.prodService.fav); // console.log(this.prodService.fav);
......
src/app/productlist/productlist.page.scss
...@@ -288,4 +288,12 @@ ...@@ -288,4 +288,12 @@
text-transform: uppercase; text-transform: uppercase;
margin-top: 10px; margin-top: 10px;
} }
}
@media only screen and (max-width: 350px) {
.product_list {
.ellipse {
width: 135px !important;
}
}
} }
\ No newline at end of file
src/app/productlist/productlist.page.ts
...@@ -46,7 +46,7 @@ export class ProductlistPage implements OnInit { ...@@ -46,7 +46,7 @@ export class ProductlistPage implements OnInit {
private subjectService: SubjectService private subjectService: SubjectService
) { ) {
this.loader = true; this.loader = true;
const users = this.service.get('user').then(data => { const users = this.service.get('userData').then(data => {
if (data) { if (data) {
data = JSON.parse(data); data = JSON.parse(data);
this.custId = data.uid; this.custId = data.uid;
...@@ -72,8 +72,10 @@ export class ProductlistPage implements OnInit { ...@@ -72,8 +72,10 @@ export class ProductlistPage implements OnInit {
} }
}); });
const users = this.service.get('user').then(data => { const users = this.service.get('user').then(data => {
console.log(data);
if (data) { if (data) {
data = JSON.parse(data); data = JSON.parse(data);
this.custId = data.uid;
this.prodService.getFavlist(data.uid); this.prodService.getFavlist(data.uid);
} }
}); });
...@@ -129,10 +131,10 @@ export class ProductlistPage implements OnInit { ...@@ -129,10 +131,10 @@ export class ProductlistPage implements OnInit {
console.log(this.prodService.fav); console.log(this.prodService.fav);
if (state > -1) { if (state > -1) {
this.prodService.fav.splice(state, 1); this.prodService.fav.splice(state, 1);
this.prodService.changeFav(index, 'yes'); this.prodService.changeFav(index, 'yes', this.custId);
} else { } else {
this.prodService.fav.push(index); this.prodService.fav.push(index);
this.prodService.changeFav(index, 'no'); this.prodService.changeFav(index, 'no', this.custId);
} }
return; return;
console.log(this.prodService.fav); console.log(this.prodService.fav);
......
src/app/profile/profile.page.html
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
<div class="account_wrapper"> <div class="account_wrapper">
<div class="account_header"> <div class="account_header">
<h5 class="floatLeft">ACCOUNT INFORMATION</h5> <h5 class="floatLeft">ACCOUNT INFORMATION</h5>
<span class="floatRight" (click)="goToPage('changedetails', user && user)"><img <span class="floatRight" (click)="goToPage('changedetails', user && user)"><img src="../../assets/edit.png"
src="../../assets/edit.png" /></span> /></span>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div class="row"> <div class="row">
...@@ -40,50 +40,56 @@ ...@@ -40,50 +40,56 @@
</ion-col> </ion-col>
<ion-col class="textRight p0"> <ion-col class="textRight p0">
<h6>{{loggedUser.phone}}</h6> <h6>{{loggedUser.phone}}</h6>
<span class="ar-span" *ngIf="loggedUser.phoneVerified == true">Verified</span> <span class="ar-span" *ngIf="loggedUser.phoneVerified == true">Verified</span
<span class="ar-span" *ngIf="loggedUser.phoneVerified == false">Not >
Verified yet</span> <span class="ar-span" *ngIf="loggedUser.phoneVerified == false"
</ion-col> >Not Verified yet</span
</ion-row> >
</div> </ion-col>
<div class="row"> </ion-row>
<ion-row> </div>
<ion-col class="textLeft p0"> <div class="row">
<p> <ion-row>
Email <ion-col class="textLeft p0">
</p> <p>
</ion-col> Email
<ion-col class="textRight p0"> </p>
<h6>{{loggedUser.emailId}}</h6> </ion-col>
<span class="ar-span" *ngIf="loggedUser.emailVerified == true">Verified</span> <ion-col class="textRight p0">
<span class="ar-span" *ngIf="loggedUser.emailVerified == false">Not Verified yet</span> <h6>{{loggedUser.emailId}}</h6>
</ion-col> <span class="ar-span" *ngIf="loggedUser.emailVerified == true"
</ion-row> >Verified</span
</div> >
<hr /> <span class="ar-span" *ngIf="loggedUser.emailVerified == false"
<ion-row (click)="goToPage('wishlist')"> >Not Verified yet</span
<ion-col class="textLeft p0"> >
<p>Wishlist</p> </ion-col>
</ion-col> </ion-row>
<ion-col class="textRight p0"> </div>
<h6 *ngIf="wishService.whishItem"> <hr />
({{wishService.whishItem.length}}) <ion-row (click)="goToPage('wishlist')">
</h6> <ion-col class="textLeft p0">
</ion-col> <p>Wishlist</p>
</ion-row> </ion-col>
<hr /> <ion-col class="textRight p0">
<ion-row (click)="goToPage('address')"> <h6 *ngIf="wishService.whishItem">
<ion-col class="textLeft p0"> ({{wishService.whishItem.length}})
<p>Address</p> </h6>
</ion-col> </ion-col>
<ion-col class="textRight p0"> </ion-row>
<h6 *ngIf="addressService.addList"> <hr />
({{addressService.addressList.length}}) <ion-row (click)="goToPage('address')">
</h6> <ion-col class="textLeft p0">
</ion-col> <p>Address</p>
</ion-row> </ion-col>
<hr /> <ion-col class="textRight p0">
<!-- <ion-row> <h6 *ngIf="addressService.addList">
({{addressService.addressList.length}})
</h6>
</ion-col>
</ion-row>
<hr />
<!-- <ion-row>
<ion-col class="textLeft p0"> <ion-col class="textLeft p0">
<p>My Cards</p> <p>My Cards</p>
</ion-col> </ion-col>
...@@ -94,56 +100,56 @@ ...@@ -94,56 +100,56 @@
</ion-col> </ion-col>
</ion-row> </ion-row>
<hr /> --> <hr /> -->
<ion-row (click)="goToPage('myorder')"> <ion-row (click)="goToPage('myorder')">
<ion-col class="textLeft p0"> <ion-col class="textLeft p0">
<p>My Order</p> <p>My Order</p>
</ion-col> </ion-col>
<ion-col class="textRight p0"> <ion-col class="textRight p0">
<h6> <h6>
<ion-icon name="arrow-forward"></ion-icon> <ion-icon name="arrow-forward"></ion-icon>
</h6> </h6>
</ion-col> </ion-col>
</ion-row> </ion-row>
<hr /> <hr />
<ion-row (click)="goToPage('preference')"> <ion-row (click)="goToPage('preference')">
<ion-col class="textLeft p0"> <ion-col class="textLeft p0">
<p>Preferences</p> <p>Preferences</p>
</ion-col> </ion-col>
<ion-col class="textRight p0"> <ion-col class="textRight p0">
<h6> <h6>
<ion-icon name="arrow-forward"></ion-icon> <ion-icon name="arrow-forward"></ion-icon>
</h6> </h6>
</ion-col> </ion-col>
</ion-row> </ion-row>
<hr /> <hr />
<ion-row> <ion-row>
<ion-col class="textLeft p0"> <ion-col class="textLeft p0">
<p>Currency</p> <p>Currency</p>
</ion-col> </ion-col>
<ion-col class="textRight p0"> <ion-col class="textRight p0">
<h6> <h6>
<span>AUD</span> <span>AUD</span>
</h6> </h6>
</ion-col> </ion-col>
</ion-row> </ion-row>
</div> </div>
<div class="logout-pop-wrapper" *ngIf="isShow" [@slideInOut]> <div class="logout-pop-wrapper" *ngIf="isShow" [@slideInOut]>
<div class="logout_inner"> <div class="logout_inner">
<h4>Logout</h4> <h4>Logout</h4>
<p>Are you sure to Logout ?</p> <p>Are you sure to Logout ?</p>
<div class="logout_footer"> <div class="logout_footer">
<button class="btn-cancel floatLeft" (click)="istoggle();"> <button class="btn-cancel floatLeft" (click)="istoggle();">
Cancel Cancel
</button> </button>
<button class="btn-logout floatRight" (click)="authService.SignOut(); istoggle()"> <button class="btn-logout floatRight" (click)="authService.SignOut(); istoggle()">
Logout Logout
</button> </button>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div>
</div> </div>
</div> </div>
</div>
</ion-content> </ion-content>
<div class="loader" *ngIf="loader"> <div class="loader" *ngIf="loader">
<div class="lds-ripple"> <div class="lds-ripple">
......
src/app/profile/profile.page.ts
...@@ -59,8 +59,6 @@ export class ProfilePage implements OnInit { ...@@ -59,8 +59,6 @@ export class ProfilePage implements OnInit {
this.service.get('user').then(data => { this.service.get('user').then(data => {
if (data) { if (data) {
this.userData = JSON.parse(data); this.userData = JSON.parse(data);
this.wishService.wishList(this.userData.uid);
console.log(this.userData);
} }
}); });
...@@ -69,7 +67,9 @@ export class ProfilePage implements OnInit { ...@@ -69,7 +67,9 @@ export class ProfilePage implements OnInit {
// Get user Data // Get user Data
this.service.get('userData').then(data => { this.service.get('userData').then(data => {
if (data) { if (data) {
console.log(data);
this.loggedUser = JSON.parse(data); this.loggedUser = JSON.parse(data);
this.wishService.wishList(this.loggedUser.uid);
} }
}); });
}); });
......
src/app/signup/signup.page.html
<div class="nav_header"> <div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()"> <button class="nav_btn nav_back floatLeft" (click)="goToPage('login')">
<img src="../assets/Group17_2.png" /> <img src="../assets/Group17_2.png" />
</button> </button>
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
......
src/assets/asset_avatar.png
src/assets/asset_avatar.png

26.5 KB | W: | H:

src/assets/asset_avatar.png

21.3 KB | W: | H:

src/assets/asset_avatar.png
src/assets/asset_avatar.png
src/assets/asset_avatar.png
src/assets/asset_avatar.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/pin.svg 0 → 100644
<svg xmlns="http://www.w3.org/2000/svg" width="65.533" height="99" viewBox="0 0 65.533 99">
<g id="Group_6" data-name="Group 6" transform="translate(-20 0)">
<g id="Group_5" data-name="Group 5" transform="translate(-2.935 1.022)">
<ellipse id="Ellipse_4" data-name="Ellipse 4" cx="17" cy="6" rx="17" ry="6" transform="translate(38.935 85.978)" fill="#b5b5cd"/>
<ellipse id="Ellipse_6" data-name="Ellipse 6" cx="17" cy="6" rx="17" ry="6" transform="translate(38.935 85.978)" fill="#b5b5cd"/>
</g>
<g id="Group_2" data-name="Group 2" transform="translate(3 -3)">
<circle id="Ellipse_1" data-name="Ellipse 1" cx="24.5" cy="24.5" r="24.5" transform="translate(25 11)" fill="#fff"/>
<g id="pin" transform="translate(-0.222 -0.104)">
<path id="Path_1" data-name="Path 1" d="M49.8,96.9c-3.7-4.7-7.4-9.2-10.9-13.9A147.669,147.669,0,0,1,22.5,56.1a55.361,55.361,0,0,1-4.9-15.4,31.919,31.919,0,0,1,7.4-26A31.406,31.406,0,0,1,44.9,3.5,32.726,32.726,0,0,1,82,28.8c1.6,7.1.5,13.9-1.8,20.7A111.792,111.792,0,0,1,67.3,74.2,205.419,205.419,0,0,1,50.7,96,3.74,3.74,0,0,1,49.8,96.9Zm.3-84.6A23.6,23.6,0,1,0,73.6,35.9,23.475,23.475,0,0,0,50.1,12.3Z" fill="#242052"/>
<g id="Group_1" data-name="Group 1">
<path id="Path_2" data-name="Path 2" d="M33.3,45.1V25.6L50,16.1l4.7,2.2L37.6,28l-.1,14.6,12.6,7,12.4-6.9-.2-9.4-7.9,4.5v6.1L50.7,46l-9.4-5.1V29.7l16.2-9.2,4.7,2.2L45.5,32.2v6.1L50.1,41l.1-5.7,16.5-9.4V45.1L50.1,54.5Z" fill="#c9974d"/>
</g>
</g>
</g>
</g>
</svg>
src/config/auth.service.ts
...@@ -350,13 +350,19 @@ export class AuthService { ...@@ -350,13 +350,19 @@ export class AuthService {
resetPassword(email: string) { resetPassword(email: string) {
this.loader = true; this.loader = true;
this.afAuth.auth.sendPasswordResetEmail(email) this.afAuth.auth
.sendPasswordResetEmail(email)
.then(() => { .then(() => {
this.service.showToast('Password reset mail has been sent your mail Id', 'top', 'my-toast', 2000); this.service.showToast(
'Password reset mail has been sent your mail Id',
'top',
'my-toast',
2000
);
this.loader = false; this.loader = false;
this.router.navigateByUrl('login', { replaceUrl: true }); this.router.navigateByUrl('login', { replaceUrl: true });
}) })
.catch((error) => { .catch(error => {
this.service.showToast(error, 'top', 'my-error', 1000); this.service.showToast(error, 'top', 'my-error', 1000);
this.loader = false; this.loader = false;
}); });
......
src/config/products.service.ts
...@@ -22,7 +22,8 @@ export class ProductsService { ...@@ -22,7 +22,8 @@ export class ProductsService {
this.product = []; this.product = [];
this.fav = []; this.fav = [];
this.prodSlideImg = []; this.prodSlideImg = [];
this.service.get('user').then(data => { this.service.get('userData').then(data => {
console.log(data);
this.user = JSON.parse(data); this.user = JSON.parse(data);
this.getFavlist(this.user.uid); this.getFavlist(this.user.uid);
}); });
...@@ -263,12 +264,12 @@ export class ProductsService { ...@@ -263,12 +264,12 @@ export class ProductsService {
}); });
} }
public async changeFav(index, type) { public async changeFav(index, type, custId) {
// console.log(index, type, this.user.uid); console.log(index, type, custId);
if (type === 'no') { if (type === 'no') {
this.afs this.afs
.collection('favourite') .collection('favourite')
.doc(this.user.uid) .doc(custId)
.valueChanges() .valueChanges()
.pipe( .pipe(
take(1) // Here you can limit to only emit once, using the take operator take(1) // Here you can limit to only emit once, using the take operator
...@@ -277,7 +278,7 @@ export class ProductsService { ...@@ -277,7 +278,7 @@ export class ProductsService {
if (value === undefined) { if (value === undefined) {
this.afs this.afs
.collection('favourite') .collection('favourite')
.doc(this.user.uid) .doc(custId)
.set({ .set({
[index]: true [index]: true
}); });
...@@ -287,14 +288,14 @@ export class ProductsService { ...@@ -287,14 +288,14 @@ export class ProductsService {
// console.log(value); // console.log(value);
this.afs this.afs
.collection('favourite') .collection('favourite')
.doc(this.user.uid) .doc(custId)
.set(value); .set(value);
} }
}); });
} else { } else {
this.afs this.afs
.collection('favourite') .collection('favourite')
.doc(this.user.uid) .doc(custId)
.valueChanges() .valueChanges()
.pipe( .pipe(
take(1) // Here you can limit to only emit once, using the take operator take(1) // Here you can limit to only emit once, using the take operator
...@@ -309,7 +310,7 @@ export class ProductsService { ...@@ -309,7 +310,7 @@ export class ProductsService {
// console.log(value); // console.log(value);
this.afs this.afs
.collection('favourite') .collection('favourite')
.doc(this.user.uid) .doc(custId)
.set(value); .set(value);
} else { } else {
// console.log(value); // console.log(value);
......
src/config/shopper.service.ts
...@@ -16,7 +16,11 @@ export class ShoppersService { ...@@ -16,7 +16,11 @@ export class ShoppersService {
shoppers: Shopper[] = []; shoppers: Shopper[] = [];
activeshoppers: Shopper[] = []; activeshoppers: Shopper[] = [];
nearshoppers: Shopper[] = []; nearshoppers: Shopper[] = [];
constructor(public afs: AngularFirestore, public afAuth: AngularFireAuth, public service: ServiceService) { constructor(
public afs: AngularFirestore,
public afAuth: AngularFireAuth,
public service: ServiceService
) {
this.featuredshopperList(); this.featuredshopperList();
this.getNearBy(-33.87276, 151.20534, this.service.distance); this.getNearBy(-33.87276, 151.20534, this.service.distance);
} }
...@@ -62,6 +66,121 @@ export class ShoppersService { ...@@ -62,6 +66,121 @@ export class ShoppersService {
}); });
} }
public async categoryShopperList(catId = null) {
const This = this;
const state = true;
this.shoppers = [];
const catRef = this.afs.collection('shopcategories').doc(catId).get().subscribe((data) => {
console.log(data.data());
let shoppeerList = [];
const shoppers = data.data();
if (shoppers && Object.keys(shoppers).length > 0) {
Object.keys(shoppers)
.forEach(function eachKey(key) {
shoppeerList.push(key);
});
console.log(shoppeerList);
const orderRef: AngularFirestoreCollection<any> = this.afs.collection(
'shoppers',
ref => ref.where('uid', 'in', shoppeerList).where('status', '==', state).orderBy('name', 'asc')
);
/* this.documentosCol = this.afs.collection('shoppers', ref => ref.where('pagada', 'in', [true, false]));*/
orderRef.valueChanges().subscribe(value => {
this.shoppers = [];
const res = value;
if (res.length > 0) {
res.forEach(item => {
// console.log(item);
const shopper: Shopper = {
name: item.name,
emailId: item.emailId,
phone: item.phone,
uid: item.uid,
profilePhoto: item.profilePic,
status: item.status,
address: item.address,
featured: item.featured,
featuredImage: item.featuredImage,
shopName: item.shopName,
shopStatus: item.shopStatus,
workingHours: item.workingHours,
caption: item.caption,
centre: item.centre,
location: item.location,
rate: item.rate,
centerId: item.centerId
};
this.shoppers.push(shopper);
});
// console.log(this.shoppers);
} else {
// alert('No Orders Found');
}
});
} else {
console.log(this.shoppers);
this.shoppers = [];
this.shoppers.length = 0;
}
});
/* .then(doc => {
if (!doc.exists) {
console.log('No such document!');
} else {
console.log('Document data:', doc.data());
}
})
.catch(err => {
console.log('Error getting document', err);
}); */
/*const orderRef: AngularFirestoreCollection<any> = this.afs.collection(
'shoppers',
ref => ref.where(type, '==', centerId).where('status', '==', state).orderBy('name', 'asc')
);
orderRef.valueChanges().subscribe(value => {
this.shoppers = [];
const res = value;
if (res.length > 0) {
res.forEach(item => {
// console.log(item);
const shopper: Shopper = {
name: item.name,
emailId: item.emailId,
phone: item.phone,
uid: item.uid,
profilePhoto: item.profilePic,
status: item.status,
address: item.address,
featured: item.featured,
featuredImage: item.featuredImage,
shopName: item.shopName,
shopStatus: item.shopStatus,
workingHours: item.workingHours,
caption: item.caption,
centre: item.centre,
location: item.location,
rate: item.rate,
centerId: item.centerId
};
this.shoppers.push(shopper);
});
// console.log(this.shoppers);
} else {
// alert('No Orders Found');
}
});*/
}
public async featuredshopperList() { public async featuredshopperList() {
const This = this; const This = this;
const state = true; const state = true;
......
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