Skip to content

G
getme
Commit 5690c8d0 by Arjun
Options

Merge branch 'master' of https://gitlab.techware.co.in/amal/getme into arjun

parents b09e2d18 17b9765f
Showing with 1914 additions and 1270 deletions
.scannerwork/css-bundle/package.json 0 → 100644
{
"name": "css-bundle",
"version": "1.0.0",
"description": "Simple node project to run stylelint from SonarCSS",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "",
"license": "LGPL-3.0",
"dependencies": {
"stylelint": "10.1.0"
}
}
.scannerwork/css-bundle/stylelintconfig.json 0 → 100644
{"rules":{"block-no-empty":true,"string-no-newline":true,"comment-no-empty":true,"function-linear-gradient-no-nonstandard-direction":true,"media-feature-name-no-unknown":true,"color-no-invalid-hex":true,"font-family-no-duplicate-names":true,"no-duplicate-at-import-rules":true,"no-empty-source":true,"declaration-block-no-duplicate-properties":[true,{"ignore":["consecutive-duplicates-with-different-values"]}],"selector-type-no-unknown":[true,{"ignoreTypes":["/^mat-/"]}],"at-rule-no-unknown":[true,{"ignoreAtRules":["value","at-root","content","debug","each","else","error","for","function","if","include","mixin","return","warn","while","extend"]}],"no-duplicate-selectors":true,"font-family-no-missing-generic-family-keyword":true,"no-extra-semicolons":true,"no-invalid-double-slash-comments":true,"selector-pseudo-element-no-unknown":true,"selector-pseudo-class-no-unknown":[true,{"ignorePseudoClasses":["local","global","export","import"]}],"keyframe-declaration-no-important":true,"function-calc-no-unspaced-operator":true,"property-no-unknown":[true,{"ignoreProperties":["composes","exportedKey","localAlias"]}],"declaration-block-no-shorthand-property-overrides":true,"unit-no-unknown":[true,{"ignoreUnits":["x"]}]}}
.scannerwork/report-task.txt 0 → 100644
projectKey=GetmiUser
serverUrl=http://sonarqube.techlabz.in
serverVersion=7.9.2.30863
dashboardUrl=http://sonarqube.techlabz.in/dashboard?id=GetmiUser
ceTaskId=AW_wM7iyfQ91M3jwRMen
ceTaskUrl=http://sonarqube.techlabz.in/api/ce/task?id=AW_wM7iyfQ91M3jwRMen
package-lock.json
......@@ -5,9 +5,12 @@
"requires": true,
"dependencies": {
"@agm/core": {
"version": "1.0.0-beta.7",
"resolved": "https://registry.npmjs.org/@agm/core/-/core-1.0.0-beta.7.tgz",
"integrity": "sha512-NXJqB2wCahWGSqvQazLHbVrg3Dhg5zTdhG9yP7EVVGfIft5lbY83KLVpbYFeVI/l+ggeJWAC9nVUr7CeDS96uQ=="
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/@agm/core/-/core-1.1.0.tgz",
"integrity": "sha512-cMvmm3+3/uuVFurLv1FKhE0/6ssIlDvYBjQFCi8ELg7h0OY2MkIU1MXWr7z+f/xZ08E936I4eeddni6k4yUTIA==",
"requires": {
"tslib": "^1.9.0"
}
},
"@angular-devkit/architect": {
"version": "0.801.3",
......@@ -192,9 +195,9 @@
}
},
"@angular/animations": {
"version": "8.2.11",
"resolved": "https://registry.npmjs.org/@angular/animations/-/animations-8.2.11.tgz",
"integrity": "sha512-u0PSR2uvSqn3ovgGlw2H8ZueyYN42SLir2Yn3+7sGE+LcYOSTjyJ/GIgjV8jWddvPbx7KYzFRCs6bEMpBsMXYg==",
"version": "8.2.14",
"resolved": "https://registry.npmjs.org/@angular/animations/-/animations-8.2.14.tgz",
"integrity": "sha512-3Vc9TnNpKdtvKIXcWDFINSsnwgEMiDmLzjceWg1iYKwpeZGQahUXPoesLwQazBMmxJzQiA4HOMj0TTXKZ+Jzkg==",
"requires": {
"tslib": "^1.9.0"
}
......@@ -1048,9 +1051,9 @@
}
},
"@angular/fire": {
"version": "5.2.1",
"resolved": "https://registry.npmjs.org/@angular/fire/-/fire-5.2.1.tgz",
"integrity": "sha512-pS4zWhLLANzMbYVIKNtebDQKhm9+KANUDvDV6DwKP24XHzkZdvazKe1HC6uXWlf7QmDxSPFleCSBkn0tnQQzdQ=="
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/@angular/fire/-/fire-5.3.0.tgz",
"integrity": "sha512-Z/dywnrQiuz6Hfq0MncDvwB0obirWdCetrd//OkHsWKLKi1deFrb6ChuTBTGj+kN/cjHUEwI9pD4uoDvU7jyAg=="
},
"@angular/forms": {
"version": "8.1.3",
......@@ -1251,13 +1254,13 @@
}
},
"@firebase/app": {
"version": "0.4.14",
"resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.4.14.tgz",
"integrity": "sha512-2awiJkYz/SMOAEGg5Qvq/596RywoefRckhjUS42kZC7C1HZ06EcQHr26ejAMFk9qeXWYLs4eumSw/V4SDYR3Kw==",
"version": "0.4.17",
"resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.4.17.tgz",
"integrity": "sha512-YkCe10/KHnfJ5Lx79SCQ4ZJRlpnwe8Yns6Ntf7kltXq1hCQCUrKEU3zaOTPY90SBx36hYm47IaqkKwT/kBOK3A==",
"requires": {
"@firebase/app-types": "0.4.3",
"@firebase/logger": "0.1.22",
"@firebase/util": "0.2.25",
"@firebase/logger": "0.1.25",
"@firebase/util": "0.2.28",
"dom-storage": "2.1.0",
"tslib": "1.10.0",
"xmlhttprequest": "1.8.0"
......@@ -1269,26 +1272,26 @@
"integrity": "sha512-VU5c+ZjejvefLVH4cjiX3Hy1w9HYMv7TtZ1tF9ZmOqT4DSIU1a3VISWoo8///cGGffr5IirMO+Q/WZLI4p8VcA=="
},
"@firebase/auth": {
"version": "0.11.8",
"resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-0.11.8.tgz",
"integrity": "sha512-aMSWaOCQmQtLKb1j96O7tErRx+kgq2OV3tMV/sKLkXp1J7SP03ejQfi+wOGDYnTWD6mNv+7b8ra1po+IHkydtg==",
"version": "0.12.0",
"resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-0.12.0.tgz",
"integrity": "sha512-DGYvAmz2aUmrWYS3ADw/UmsuicxJi6G+X38XITqNPUrd1YxmM5SBzX19oEb9WCrJZXcr4JaESg6hQkT2yEPaCA==",
"requires": {
"@firebase/auth-types": "0.7.2"
"@firebase/auth-types": "0.8.0"
}
},
"@firebase/auth-types": {
"version": "0.7.2",
"resolved": "https://registry.npmjs.org/@firebase/auth-types/-/auth-types-0.7.2.tgz",
"integrity": "sha512-xm3evp6671LoI+6M8Om3OhikabLf88Ivz1e7aR8uZjVBYptEYbF3seDIyHn/3wWdVYbp20WK4aWixKlRnHl+6Q=="
"version": "0.8.0",
"resolved": "https://registry.npmjs.org/@firebase/auth-types/-/auth-types-0.8.0.tgz",
"integrity": "sha512-foQHhvyB0RR+mb/+wmHXd/VOU+D8fruFEW1k79Q9wzyTPpovMBa1Mcns5fwEWBhUfi8bmoEtaGB8RSAHnTFzTg=="
},
"@firebase/database": {
"version": "0.5.0",
"resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.5.0.tgz",
"integrity": "sha512-7XLy33bdVRpc+Z46SAk2XzbNuGD/jgOilYRuY+HlPt5qbhzhWHe4lnBLS6toMU299Vcvk6vLRup73qLui8FQpQ==",
"version": "0.5.4",
"resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.5.4.tgz",
"integrity": "sha512-Hz1Bi3fzIcNNocE4EhvvwoEQGurG2BGssWD3/6a2bzty+K1e57SLea2Ied8QYNBUU1zt/4McHfa3Y71EQIyn/w==",
"requires": {
"@firebase/database-types": "0.4.2",
"@firebase/logger": "0.1.22",
"@firebase/util": "0.2.25",
"@firebase/database-types": "0.4.3",
"@firebase/logger": "0.1.25",
"@firebase/util": "0.2.28",
"faye-websocket": "0.11.3",
"tslib": "1.10.0"
},
......@@ -1304,33 +1307,36 @@
}
},
"@firebase/database-types": {
"version": "0.4.2",
"resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.4.2.tgz",
"integrity": "sha512-rBF/Sp4S4zzVg+a6h0iEiXR2GdNRrvx2BR6IcvGHnSPF7XVpj9UuUWtZMJyO+vWP3zlIGDvlNRJ4qF01Y6KxGg=="
"version": "0.4.3",
"resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.4.3.tgz",
"integrity": "sha512-21yCiJA2Tyt6dJYwWeB69MwoawBu5UWNtP6MAY0ugyRBHVdjAMHMYalPxCjZ46LAmhfim0+i8NXRadOFVS3hUA==",
"requires": {
"@firebase/app-types": "0.x"
}
},
"@firebase/firestore": {
"version": "1.4.10",
"resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-1.4.10.tgz",
"integrity": "sha512-TyPwuWdY64G0cWm4H/7x6XJESHINIQIOK0gmjw1BYA+kPudzNaoyeJ6nxZRzZ7lcNol78FLCU7eb/ChDKVAo9g==",
"requires": {
"@firebase/firestore-types": "1.4.4",
"@firebase/logger": "0.1.22",
"@firebase/util": "0.2.25",
"@firebase/webchannel-wrapper": "0.2.24",
"version": "1.5.3",
"resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-1.5.3.tgz",
"integrity": "sha512-O/yAbXpitOA6g627cUl0/FHYlkTy1EiEKMKOlnlMOJF2fH+nLVZREXjsrCC7N2tIvTn7yYwfpZ4zpSNvrhwiTA==",
"requires": {
"@firebase/firestore-types": "1.5.0",
"@firebase/logger": "0.1.25",
"@firebase/util": "0.2.28",
"@firebase/webchannel-wrapper": "0.2.26",
"@grpc/proto-loader": "^0.5.0",
"grpc": "1.22.2",
"grpc": "1.23.3",
"tslib": "1.10.0"
}
},
"@firebase/firestore-types": {
"version": "1.4.4",
"resolved": "https://registry.npmjs.org/@firebase/firestore-types/-/firestore-types-1.4.4.tgz",
"integrity": "sha512-kFpmzkUKfzrXkcMad+TQlMs55dWNY0q1UxGICW82EneX3Yg6HN3Nx36kYfqH+SLBFUN1ZTikN07alMp0MA9p9g=="
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/@firebase/firestore-types/-/firestore-types-1.5.0.tgz",
"integrity": "sha512-VhRHNbEbak+R2iK8e1ir2Lec7eaHMZpGTRy6LMtzATYthlkwNHF9tO8JU8l6d1/kYkI4+DWzX++i3HhTziHEWA=="
},
"@firebase/functions": {
"version": "0.4.15",
"resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.4.15.tgz",
"integrity": "sha512-mAOOHKaHqGRP2+5jlKesGUPQFiiy/sgjW5iURvzv0OJUdhERGlfCj9JM5w/1zosXG0oAiiu9Q+K/84dXyeaw4A==",
"version": "0.4.18",
"resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.4.18.tgz",
"integrity": "sha512-N/ijwpxJy26kOErYIi5QS8pQgMZEuEMF/zDaNmgqcoN3J8P52NhBnVQZnIl+U4W96nQfNiURhSwXEERHFyvSZQ==",
"requires": {
"@firebase/functions-types": "0.3.8",
"@firebase/messaging-types": "0.3.2",
......@@ -1344,12 +1350,12 @@
"integrity": "sha512-9hajHxA4UWVCGFmoL8PBYHpamE3JTNjObieMmnvZw3cMRTP2EwipMpzZi+GPbMlA/9swF9yHCY/XFAEkwbvdgQ=="
},
"@firebase/installations": {
"version": "0.2.4",
"resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.2.4.tgz",
"integrity": "sha512-lJlqVa7r/HuI9/d+oSr0CxyN/A1nMMgqDJJr0geDLqfDokrmFhkRxbtb28saGaGnfLzc1KhvIB/TdhzDJ/fDJA==",
"version": "0.2.7",
"resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.2.7.tgz",
"integrity": "sha512-67tzowHVwRBtEuB1HLMD+fCdoRyinOQlMKBes7UwrtZIVd0CPDUqAKxNqup5EypWZb7O2tqFtRzK7POajfSNMA==",
"requires": {
"@firebase/installations-types": "0.1.2",
"@firebase/util": "0.2.25",
"@firebase/util": "0.2.28",
"idb": "3.0.2",
"tslib": "1.10.0"
}
......@@ -1360,17 +1366,17 @@
"integrity": "sha512-fQaWIW8hyX1XUN7+FCSPjvM1agFjGidVuF4Sxi7aFwfyh5t+4fD2VpM4wCQbWmodnx4fZLvsuQd9mkxxU+lGYQ=="
},
"@firebase/logger": {
"version": "0.1.22",
"resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.1.22.tgz",
"integrity": "sha512-os1vG5FohEF9gl27duZeTtEphOP7oHQ+YjnT+sT2dGprkTIAyaEkzH6G8AgLPUqmASSsoa6BqY5kFXHQi9+xGw=="
"version": "0.1.25",
"resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.1.25.tgz",
"integrity": "sha512-/lRhuepVcCCnQ2jcO5Hr08SYdmZDTQU9fdPdzg+qXJ9k/QnIrD2RbswXQcL6mmae3uPpX7fFXQAoScJ9pzp50w=="
},
"@firebase/messaging": {
"version": "0.4.8",
"resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.4.8.tgz",
"integrity": "sha512-+NPRHQt4v2V07vmw98/ybOTwIspA3EaRc5Ni6D05d7N0U6RQaiqJae6T3VBMvQovXWzLRqA244KO1Z9OVTQdKg==",
"version": "0.4.11",
"resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.4.11.tgz",
"integrity": "sha512-KYt479yio6ThkV7Pb9LRB1KPIBio+OR4RozwyoLC1ZSVQdTIrd/sVEuDSzYY88Wh/6Kg6ejdu2z6mfWG9l1ZaQ==",
"requires": {
"@firebase/messaging-types": "0.3.2",
"@firebase/util": "0.2.25",
"@firebase/util": "0.2.28",
"tslib": "1.10.0"
}
},
......@@ -1380,14 +1386,14 @@
"integrity": "sha512-2qa2qNKqpalmtwaUV3+wQqfCm5myP/dViIBv+pXF8HinemIfO1IPQtr9pCNfsSYyus78qEhtfldnPWXxUH5v0w=="
},
"@firebase/performance": {
"version": "0.2.15",
"resolved": "https://registry.npmjs.org/@firebase/performance/-/performance-0.2.15.tgz",
"integrity": "sha512-I0DYGx59n7r+U0xRi3ee3pidjQF/lp865pHdd+x+lxSLHE3u0XxS3tiSr2xePqm4C7v+syW+wEQRowd9z7UzoA==",
"version": "0.2.19",
"resolved": "https://registry.npmjs.org/@firebase/performance/-/performance-0.2.19.tgz",
"integrity": "sha512-dINWwR/XcSiSnFNNX7QWfec8bymiXk1Zp6mPyPN+R9ONMrpDbygQUy06oT/6r/xx9nHG4Za6KMUJag3sWNKqnQ==",
"requires": {
"@firebase/installations": "0.2.4",
"@firebase/logger": "0.1.22",
"@firebase/installations": "0.2.7",
"@firebase/logger": "0.1.25",
"@firebase/performance-types": "0.0.3",
"@firebase/util": "0.2.25",
"@firebase/util": "0.2.28",
"tslib": "1.10.0"
}
},
......@@ -1397,19 +1403,19 @@
"integrity": "sha512-RuC63nYJPJU65AsrNMc3fTRcRgHiyNcQLh9ufeKUT1mEsFgpxr167gMb+tpzNU4jsbvM6+c6nQAFdHpqcGkRlQ=="
},
"@firebase/polyfill": {
"version": "0.3.19",
"resolved": "https://registry.npmjs.org/@firebase/polyfill/-/polyfill-0.3.19.tgz",
"integrity": "sha512-70gNPxxHCaSKcNw1g9XfBe15LWrvzvgzUGBVgAdv7zkpgtHMu/uEuklb+A0H1GJtNn6ijyHEAJGXR3KHJ92HEg==",
"version": "0.3.22",
"resolved": "https://registry.npmjs.org/@firebase/polyfill/-/polyfill-0.3.22.tgz",
"integrity": "sha512-PYbEqDHJhJJoF2Q5IB/oP0Tz6O2vSUPtODy9kUQibi+T0bK1gkTaySPwz8GAgHfIpFNENj1kK+7Xpf87R8bYbw==",
"requires": {
"core-js": "3.1.4",
"core-js": "3.2.1",
"promise-polyfill": "8.1.3",
"whatwg-fetch": "2.0.4"
},
"dependencies": {
"core-js": {
"version": "3.1.4",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.1.4.tgz",
"integrity": "sha512-YNZN8lt82XIMLnLirj9MhKDFZHalwzzrL9YLt6eb0T5D0EDl4IQ90IGkua8mHbnxNrkj1d8hbdizMc0Qmg1WnQ=="
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.2.1.tgz",
"integrity": "sha512-Qa5XSVefSVPRxy2XfUC13WbvqkxhkwB3ve+pgCQveNgYzbM/UxZeu1dcOX/xr4UmfUd+muuvsaxilQzCyUurMw=="
},
"whatwg-fetch": {
"version": "2.0.4",
......@@ -1419,12 +1425,12 @@
}
},
"@firebase/storage": {
"version": "0.3.9",
"resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.3.9.tgz",
"integrity": "sha512-Fxku8HVilac2zx1hnxshcnh4WhbY5DWT10dQwrFYNUFW1RuRfTB0zm3SNOVy4NAt7xpVIjqSjFs8mWDXGe7qaQ==",
"version": "0.3.12",
"resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.3.12.tgz",
"integrity": "sha512-8hXt3qPZlVH+yPF4W9Dc15/gBiTPGUJUgYs3dH9WnO41QWl1o4aNlZpZK/pdnpCIO1GmN0+PxJW9TCNb0H0Hqw==",
"requires": {
"@firebase/storage-types": "0.3.3",
"@firebase/util": "0.2.25",
"@firebase/util": "0.2.28",
"tslib": "1.10.0"
}
},
......@@ -1434,92 +1440,81 @@
"integrity": "sha512-fUp4kpbxwDiWs/aIBJqBvXgFHZvgoND2JA0gJYSEsXtWtVwfgzY/710plErgZDeQKopX5eOR1sHskZkQUy0U6w=="
},
"@firebase/util": {
"version": "0.2.25",
"resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.25.tgz",
"integrity": "sha512-J/JgYhvFLCpejzfzjzNDZGFZD3kNtTlMu+2EjiQ3tCII6w0N/uEza5GtFiYTKCjGBa51Lmi2j/OPLz+yhlQCWg==",
"version": "0.2.28",
"resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz",
"integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==",
"requires": {
"tslib": "1.10.0"
}
},
"@firebase/webchannel-wrapper": {
"version": "0.2.24",
"resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.2.24.tgz",
"integrity": "sha512-/wt/p0GrYp1cKTGMx1Ak8LpMH6PAJI7rMTYeROXi6+bZ30mhdIjpmLs11Bx26fzcZEH0jWlHXLfVdVDS5WXi2Q=="
"version": "0.2.26",
"resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.2.26.tgz",
"integrity": "sha512-VlTurkvs4v7EVFWESBZGOPghFEokQhU5au5CP9WqA8B2/PcQRDsaaQlQCA6VATuEnW+vtSiSBvTiOc4004f8xg=="
},
"@grpc/proto-loader": {
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.5.1.tgz",
"integrity": "sha512-3y0FhacYAwWvyXshH18eDkUI40wT/uGio7MAegzY8lO5+wVsc19+1A7T0pPptae4kl7bdITL+0cHpnAPmryBjQ==",
"version": "0.5.3",
"resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.5.3.tgz",
"integrity": "sha512-8qvUtGg77G2ZT2HqdqYoM/OY97gQd/0crSG34xNmZ4ZOsv3aQT/FQV9QfZPazTGna6MIoyUd+u6AxsoZjJ/VMQ==",
"requires": {
"lodash.camelcase": "^4.3.0",
"protobufjs": "^6.8.6"
}
},
"@ionic-native/core": {
"version": "5.11.0",
"resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-5.11.0.tgz",
"integrity": "sha512-2V1LOlJEvZljXywy05l0ksoc+ybxWBSAXtey3+9nS0uRVwaYAGnyc6xziemOU4dTUZ0CKW2bYp7JtgxeY54pRQ==",
"version": "5.19.1",
"resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-5.19.1.tgz",
"integrity": "sha512-n55Yd6FXZhSPiAfaphh8jVuirgwvMJOUzcQeSVLG98SbfsDFPrg18/8GfvpbsuK3V/YkgGXn08ZliygGEElLLA==",
"requires": {
"@types/cordova": "^0.0.34"
}
},
"@ionic-native/geolocation": {
"version": "5.16.0",
"resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-5.16.0.tgz",
"integrity": "sha512-SiXjwOQ1dCfP092Op8D0naMv1fDj595MdtQRxo3Qd1w8KH49O+VFmWwJzMZ6jLAxs7x9fEqnSVO3PImFZetihg==",
"version": "5.19.1",
"resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-5.19.1.tgz",
"integrity": "sha512-NqvzxvsTT3Qjr5VONGZwpow8kNHWNzYrCZt9Dx8pABkVvB11+EWQAWYVW5DF7krNrfqxNtibSRM6e9BbLf6tvw==",
"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/google-plus": {
"version": "5.0.0-beta.0",
"resolved": "https://registry.npmjs.org/@ionic-native/google-plus/-/google-plus-5.0.0-beta.0.tgz",
"integrity": "sha512-YEV8Br1vWN3jLFQ8qIYOEAGqvd13f63brRfSf1EhFG2uvR3iLH6rJ2LfGrr4BUmczgdi1NDzMSpwVSK80xPffg=="
"version": "5.19.1",
"resolved": "https://registry.npmjs.org/@ionic-native/google-plus/-/google-plus-5.19.1.tgz",
"integrity": "sha512-OcS16a4LLvtFDm89hdjH7gIUxHBOiZKcmwf/eJGlFOC+bYcIbhH4g7lt+CooE2PtqBd3PV5dXQDLXnuqA3gVrw==",
"requires": {
"@types/cordova": "^0.0.34"
}
},
"@ionic-native/native-geocoder": {
"version": "5.16.0",
"resolved": "https://registry.npmjs.org/@ionic-native/native-geocoder/-/native-geocoder-5.16.0.tgz",
"integrity": "sha512-PzKYiQU9D0gkhzk4PjGR+RhhH4thRO9oygU3Vi4JVuq2A2b6jiOhLg6pqI4W1SrStBqYX4jwArF+bNI1qWxVMQ==",
"version": "5.19.1",
"resolved": "https://registry.npmjs.org/@ionic-native/native-geocoder/-/native-geocoder-5.19.1.tgz",
"integrity": "sha512-cEkE7zrMBWbDLP8f2f68jZZpAP2sDYWWBlaOcdu1hUtVn8y+S8V62+bd1fmvN+bXVCTJ9eCQ5w7h5QuDQiIdzA==",
"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/splash-screen": {
"version": "5.11.0",
"resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.11.0.tgz",
"integrity": "sha512-I0Hos6F1ZNsdf9FEYYSTgd1BbA8uT+DpYAbEV/mRMmdEuVHYt2LFJiexvMqfjL9jPYwVUH7r+32MMJptCEEO8Q==",
"version": "5.19.1",
"resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.19.1.tgz",
"integrity": "sha512-xLCnhZU0xjfs2IiDRCLwWGVyFYrRjdbzRfVwv+Jlcnc89Pxl4dixoAhuJLNQEtuR9Dn37v49+gYyQgmNz863Tg==",
"requires": {
"@types/cordova": "^0.0.34"
}
},
"@ionic-native/status-bar": {
"version": "5.12.0",
"resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-5.12.0.tgz",
"integrity": "sha512-5l9dvqWE0qHcQzGU7RLA1vItCoh/Xvxf9GqCkXGbTG44jEIXasDquWyIU8BY7nkKyji3r/SyzEj7Pne+JT6WNw==",
"version": "5.19.1",
"resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-5.19.1.tgz",
"integrity": "sha512-LvoJi8KPl1avXJiIL7R6HH4rR2p1Sa1uxqbfsKselU+KBUO6iQVc/aOVGuBdpa2LmmWhniogJ/bWZFOCzrAphg==",
"requires": {
"@types/cordova": "^0.0.34"
}
},
"@ionic/angular": {
"version": "4.7.4",
"resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-4.7.4.tgz",
"integrity": "sha512-UCSxzYWLs9JkP07ggp/o6lLh/cQo4NHcr9LH7fcoMMGQA+i+p4X1m8qPkoiFhfK+ekMSpLiJnUkm+7wNS7+RGg==",
"version": "4.11.8",
"resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-4.11.8.tgz",
"integrity": "sha512-LiILF2DkZFs+3q1+svwVQ9MDFIGLboHOcspkC+keEucDF7Cu9jtzBmObM0WCFvzTwpFOxbbSA+J3kNzPUVKHMQ==",
"requires": {
"@ionic/core": "4.7.4",
"@ionic/core": "4.11.8",
"tslib": "^1.9.3"
}
},
......@@ -1544,11 +1539,11 @@
}
},
"@ionic/core": {
"version": "4.7.4",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-4.7.4.tgz",
"integrity": "sha512-zvRN5zGhecZnT1jxi0ZG9Lq1kQG89RBrRaizM+pvHH984o7ywcPLQfbRme8G8hBvzK/WU1g1BEt9Hq6qIvG0ug==",
"version": "4.11.8",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-4.11.8.tgz",
"integrity": "sha512-ygeoWAV1Y2Bi2lumiIHKbeYXMKx9I5sE8lyfvF0YReLwqQwK6xLCJFOo6c59AmGqmwiP6Ko+kqBUylfamtAHcg==",
"requires": {
"ionicons": "^4.6.2",
"ionicons": "^4.6.3",
"tslib": "^1.10.0"
}
},
......@@ -1677,6 +1672,15 @@
}
}
},
"@types/bytebuffer": {
"version": "5.0.40",
"resolved": "https://registry.npmjs.org/@types/bytebuffer/-/bytebuffer-5.0.40.tgz",
"integrity": "sha512-h48dyzZrPMz25K6Q4+NCwWaxwXany2FhQg/ErOcdZS1ZpsaDnDMZg8JYLMTGz7uvXKrcKGJUZJlZObyfgdaN9g==",
"requires": {
"@types/long": "*",
"@types/node": "*"
}
},
"@types/cordova": {
"version": "0.0.34",
"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
......@@ -1700,9 +1704,9 @@
}
},
"@types/googlemaps": {
"version": "3.38.0",
"resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.38.0.tgz",
"integrity": "sha512-Rp7FnrwyYGnjoxM+/q/4DRqUzvV9JKK1SBRXx8APxU6NNMtYMsWmOMsQOV2U6z8aMFzlUbRv3EDixLcDep8t9w=="
"version": "3.39.2",
"resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.39.2.tgz",
"integrity": "sha512-eQNK23aCejjTF/HCzMObVPisnj6oBpWerhKpm849xW5JYocIHpnHnGYzWc9w076hIEpMt0bAxyPOaCoruYeGqg=="
},
"@types/jasmine": {
"version": "3.3.16",
......@@ -1711,18 +1715,18 @@
"dev": true
},
"@types/jasminewd2": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.6.tgz",
"integrity": "sha512-2ZOKrxb8bKRmP/po5ObYnRDgFE4i+lQiEB27bAMmtMWLgJSqlIDqlLx6S0IRorpOmOPRQ6O80NujTmQAtBkeNw==",
"version": "2.0.8",
"resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.8.tgz",
"integrity": "sha512-d9p31r7Nxk0ZH0U39PTH0hiDlJ+qNVGjlt1ucOoTUptxb2v+Y5VMnsxfwN+i3hK4yQnqBi3FMmoMFcd1JHDxdg==",
"dev": true,
"requires": {
"@types/jasmine": "*"
}
},
"@types/long": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.0.tgz",
"integrity": "sha512-1w52Nyx4Gq47uuu0EVcsHBxZFJgurQ+rTKS3qMHxR1GY2T8c2AJYd6vZoZ9q1rupaDjU0yT+Jc2XTyXkjeMA+Q=="
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz",
"integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w=="
},
"@types/minimatch": {
"version": "3.0.3",
......@@ -1733,8 +1737,7 @@
"@types/node": {
"version": "8.9.5",
"resolved": "https://registry.npmjs.org/@types/node/-/node-8.9.5.tgz",
"integrity": "sha512-jRHfWsvyMtXdbhnz5CVHxaBgnV6duZnPlQuRSo/dm/GnmikNcmZhxIES4E9OZjUmQ8C+HCl4KJux+cXN/ErGDQ==",
"dev": true
"integrity": "sha512-jRHfWsvyMtXdbhnz5CVHxaBgnV6duZnPlQuRSo/dm/GnmikNcmZhxIES4E9OZjUmQ8C+HCl4KJux+cXN/ErGDQ=="
},
"@types/q": {
"version": "0.0.32",
......@@ -2035,9 +2038,9 @@
}
},
"agm-direction": {
"version": "0.7.8",
"resolved": "https://registry.npmjs.org/agm-direction/-/agm-direction-0.7.8.tgz",
"integrity": "sha512-ciEH6K1yxqMD0oD8mpLPUOjv2m+CZ7CMW+a2reJ2wDQwvKXyeanDjHEopg/1VhO2EwBhS4FPcfBOdpnHiVXYXw=="
"version": "0.7.9",
"resolved": "https://registry.npmjs.org/agm-direction/-/agm-direction-0.7.9.tgz",
"integrity": "sha512-62W/no1HimT2rS3jjqjcduPZHhJwHLa9V7f0cAk2rcjvpC2f18+IEVsdMBJ+Kv/YsTDoyzP5d0HhknUubFfx1w=="
},
"ajv": {
"version": "6.10.0",
......@@ -3197,14 +3200,14 @@
"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
},
"codelyzer": {
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-5.1.0.tgz",
"integrity": "sha512-QiyY2/oDQnYx4mAVEDqr+z9MwrOto18tQFjExiuRChXCy0yvngS5fQpWIxvAGpbOmZFiR1PRTRLbEI71u10maA==",
"version": "5.2.1",
"resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-5.2.1.tgz",
"integrity": "sha512-awBZXFcJUyC5HMYXiHzjr3D24tww2l1D1OqtfA9vUhEtYr32a65A+Gblm/OvsO+HuKLYzn8EDMw1inSM3VbxWA==",
"dev": true,
"requires": {
"app-root-path": "^2.2.1",
"aria-query": "^3.0.0",
"axobject-query": "^2.0.2",
"axobject-query": "2.0.2",
"css-selector-tokenizer": "^0.7.1",
"cssauron": "^1.4.0",
"damerau-levenshtein": "^1.0.4",
......@@ -3515,18 +3518,11 @@
"integrity": "sha512-QGThnPKzPxESHkruZlpE0+5aFBVOet8al0vIJ7laSUOQHIC1dd/JY6peVIbtLboKi5Dap1wCKRubOqPqH8xcQA=="
},
"cordova-plugin-googleplus": {
"version": "8.2.0",
"resolved": "https://registry.npmjs.org/cordova-plugin-googleplus/-/cordova-plugin-googleplus-8.2.0.tgz",
"integrity": "sha512-H9SJ9sA81bJH14lqi0ZcyraWxz8ZQCgd50c4g90S9nM42eQH6zGOt0NVColxVDWO4CQ4VlLDQ5jVuHpev0ahzQ==",
"version": "8.2.1",
"resolved": "https://registry.npmjs.org/cordova-plugin-googleplus/-/cordova-plugin-googleplus-8.2.1.tgz",
"integrity": "sha512-/SGTER2VJPCJ+sqGomYJbPr5/JM9EY74fqhfe1e47MurTfBs532uzbiLR47nDhhlRkCIzVy8GurZio9kcqcMJA==",
"requires": {
"q": "^1.5.1"
},
"dependencies": {
"q": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
"integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc="
}
"q": "*"
}
},
"cordova-plugin-ionic-keyboard": {
......@@ -3560,22 +3556,22 @@
"integrity": "sha512-EYC5eQFVkoYXq39l7tYKE6lEjHJ04mvTmKXxGL7quHLdFPfJMNzru/UYpn92AOfpl3PQaZmou78C7EgmFOwFQQ=="
},
"cordova-sqlite-storage": {
"version": "3.4.0",
"resolved": "https://registry.npmjs.org/cordova-sqlite-storage/-/cordova-sqlite-storage-3.4.0.tgz",
"integrity": "sha512-Uavq3HulVIYXxTFCp5aafiQhYrZF0/cGlyN76RYhIftcD5IRhza9+ghhV5abJYvuGlzY+p9dM5hPcjnYxfAH+g==",
"version": "3.4.1",
"resolved": "https://registry.npmjs.org/cordova-sqlite-storage/-/cordova-sqlite-storage-3.4.1.tgz",
"integrity": "sha512-fbpd22CJ27jVuoUWFWdDDrSWBZQ56MbsxmFYPnerlZfE4p4Kv2UXlTQJjnKJC7HZuiU+2zs01F9w5UJmRxvwAw==",
"requires": {
"cordova-sqlite-storage-dependencies": "2.1.0"
"cordova-sqlite-storage-dependencies": "2.1.1"
}
},
"cordova-sqlite-storage-dependencies": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/cordova-sqlite-storage-dependencies/-/cordova-sqlite-storage-dependencies-2.1.0.tgz",
"integrity": "sha512-m0cPOWPzckAqS0/e7v+xtcM+FrHrw63qgh5T91JdkXMKCK8sN9bDoqVNJHZ5E9y7sRO7liMUIDm6Dz439RYqGA=="
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/cordova-sqlite-storage-dependencies/-/cordova-sqlite-storage-dependencies-2.1.1.tgz",
"integrity": "sha512-1lV5Pg1FttjBmGO8z4gxtuA4BbPKtgTfUEh1Vx4boa41inizyxaowRyTeaaqEhi5gmYAaX8sRTABm9U/XckRFg=="
},
"core-js": {
"version": "2.6.9",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz",
"integrity": "sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A=="
"version": "2.6.11",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
"integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
},
"core-util-is": {
"version": "1.0.2",
......@@ -4732,22 +4728,22 @@
}
},
"firebase": {
"version": "6.4.0",
"resolved": "https://registry.npmjs.org/firebase/-/firebase-6.4.0.tgz",
"integrity": "sha512-9ZzowmeBEGaHIiuJMVZL3oLkOvbNwRFAystAZi2ADqv0Kpo1cg3Anp5l1O+5ZILfG8a7/phr3nfsw/nGvf5gcQ==",
"version": "6.6.2",
"resolved": "https://registry.npmjs.org/firebase/-/firebase-6.6.2.tgz",
"integrity": "sha512-uL9uNbutC0T8GAxrGgOCC35Ven3QKJqzJozNoVIpBuiWrB9ifm9aKOxn44h6o5ouviax3LVvoiG2jLkLkdQq4A==",
"requires": {
"@firebase/app": "0.4.14",
"@firebase/app": "0.4.17",
"@firebase/app-types": "0.4.3",
"@firebase/auth": "0.11.8",
"@firebase/database": "0.5.0",
"@firebase/firestore": "1.4.10",
"@firebase/functions": "0.4.15",
"@firebase/installations": "0.2.4",
"@firebase/messaging": "0.4.8",
"@firebase/performance": "0.2.15",
"@firebase/polyfill": "0.3.19",
"@firebase/storage": "0.3.9",
"@firebase/util": "0.2.25"
"@firebase/auth": "0.12.0",
"@firebase/database": "0.5.4",
"@firebase/firestore": "1.5.3",
"@firebase/functions": "0.4.18",
"@firebase/installations": "0.2.7",
"@firebase/messaging": "0.4.11",
"@firebase/performance": "0.2.19",
"@firebase/polyfill": "0.3.22",
"@firebase/storage": "0.3.12",
"@firebase/util": "0.2.28"
}
},
"flatted": {
......@@ -5025,10 +5021,11 @@
"integrity": "sha512-b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw=="
},
"grpc": {
"version": "1.22.2",
"resolved": "https://registry.npmjs.org/grpc/-/grpc-1.22.2.tgz",
"integrity": "sha512-gaK59oAA5/mlOIn+hQO5JROPoAzsaGRpEMcrAayW5WGETS8QScpBoQ+XBxEWAAF0kbeGIELuGRCVEObKS1SLmw==",
"version": "1.23.3",
"resolved": "https://registry.npmjs.org/grpc/-/grpc-1.23.3.tgz",
"integrity": "sha512-7vdzxPw9s5UYch4aUn4hyM5tMaouaxUUkwkgJlwbR4AXMxiYZJOv19N2ps2eKiuUbJovo5fnGF9hg/X91gWYjw==",
"requires": {
"@types/bytebuffer": "^5.0.40",
"lodash.camelcase": "^4.3.0",
"lodash.clone": "^4.5.0",
"nan": "^2.13.2",
......@@ -5074,7 +5071,7 @@
"integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8="
},
"chownr": {
"version": "1.1.1",
"version": "1.1.2",
"bundled": true
},
"cliui": {
......@@ -5103,6 +5100,13 @@
"version": "1.0.2",
"bundled": true
},
"debug": {
"version": "3.2.6",
"bundled": true,
"requires": {
"ms": "^2.1.1"
}
},
"deep-extend": {
"version": "0.6.0",
"bundled": true
......@@ -5140,12 +5144,24 @@
"wide-align": "^1.1.0"
}
},
"glob": {
"version": "7.1.4",
"bundled": true,
"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"
}
},
"has-unicode": {
"version": "2.0.1",
"bundled": true
},
"iconv-lite": {
"version": "0.4.23",
"version": "0.4.24",
"bundled": true,
"requires": {
"safer-buffer": ">= 2.1.2 < 3"
......@@ -5167,7 +5183,7 @@
}
},
"inherits": {
"version": "2.0.3",
"version": "2.0.4",
"bundled": true
},
"ini": {
......@@ -5237,6 +5253,10 @@
}
}
},
"ms": {
"version": "2.1.2",
"bundled": true
},
"needle": {
"version": "2.4.0",
"bundled": true,
......@@ -5244,19 +5264,6 @@
"debug": "^3.2.6",
"iconv-lite": "^0.4.4",
"sax": "^1.2.4"
},
"dependencies": {
"debug": {
"version": "3.2.6",
"bundled": true,
"requires": {
"ms": "^2.1.1"
}
},
"ms": {
"version": "2.1.2",
"bundled": true
}
}
},
"node-pre-gyp": {
......@@ -5288,7 +5295,7 @@
"bundled": true
},
"npm-packlist": {
"version": "1.4.1",
"version": "1.4.4",
"bundled": true,
"requires": {
"ignore-walk": "^3.0.1",
......@@ -5387,24 +5394,10 @@
}
},
"rimraf": {
"version": "2.6.3",
"version": "2.7.1",
"bundled": true,
"requires": {
"glob": "^7.1.3"
},
"dependencies": {
"glob": {
"version": "7.1.4",
"bundled": true,
"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"
}
}
}
},
"safe-buffer": {
......@@ -5420,7 +5413,7 @@
"bundled": true
},
"semver": {
"version": "5.7.0",
"version": "5.7.1",
"bundled": true
},
"set-blocking": {
......@@ -5428,7 +5421,7 @@
"bundled": true
},
"signal-exit": {
"version": "3.0.1",
"version": "3.0.2",
"bundled": true
},
"string-width": {
......@@ -6035,9 +6028,9 @@
"dev": true
},
"ionicons": {
"version": "4.6.2",
"resolved": "https://registry.npmjs.org/ionicons/-/ionicons-4.6.2.tgz",
"integrity": "sha512-OGQO/GCKFwHh5lX9wYzgfLjuj2rnQavixVgK3iv8nm7tcgYQVHw7MNNwNHY4H97ZlKiVx3qj4X5Txv9fx95oBw=="
"version": "4.6.3",
"resolved": "https://registry.npmjs.org/ionicons/-/ionicons-4.6.3.tgz",
"integrity": "sha512-cgP+VIr2cTJpMfFyVHTerq6n2jeoiGboVoe3GlaAo5zoSBDAEXORwUZhv6m+lCyxlsHCS3nqPUE+MKyZU71t8Q=="
},
"ip": {
"version": "1.1.5",
......@@ -7434,9 +7427,9 @@
}
},
"karma-jasmine-html-reporter": {
"version": "1.4.2",
"resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.4.2.tgz",
"integrity": "sha512-7g0gPj8+9JepCNJR9WjDyQ2RkZ375jpdurYQyAYv8PorUCadepl8vrD6LmMqOGcM17cnrynBawQYZHaumgDjBw==",
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.5.1.tgz",
"integrity": "sha512-LlLqsoGyxT1981z46BRaC1SaY4pTo4EHCA/qZvJEMQXzTtGMyIlmwtxny6FiLO/N/OmZh69eaoNzvBkbHVVFQA==",
"dev": true
},
"karma-source-map-support": {
......@@ -9092,9 +9085,9 @@
},
"dependencies": {
"@types/node": {
"version": "10.14.16",
"resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.16.tgz",
"integrity": "sha512-/opXIbfn0P+VLt+N8DE4l8Mn8rbhiJgabU96ZJ0p9mxOkIks5gh6RUnpHak7Yh0SFkyjO/ODbxsQQPV2bpMmyA=="
"version": "10.17.13",
"resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.13.tgz",
"integrity": "sha512-pMCcqU2zT4TjqYFrWtYHKal7Sl30Ims6ulZ4UFXxI4xbtQqK/qqKwkDoBFCfooRqqmRu9vY3xaJRwxSh673aYg=="
}
}
},
......@@ -9753,17 +9746,17 @@
}
},
"rxjs": {
"version": "6.5.2",
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz",
"integrity": "sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==",
"version": "6.5.4",
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz",
"integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==",
"requires": {
"tslib": "^1.9.0"
}
},
"rxjs-compat": {
"version": "6.5.3",
"resolved": "https://registry.npmjs.org/rxjs-compat/-/rxjs-compat-6.5.3.tgz",
"integrity": "sha512-BIJX2yovz3TBpjJoAZyls2QYuU6ZiCaZ+U96SmxQpuSP/qDUfiXPKOVLbThBB2WZijNHkdTTJXKRwvv5Y48H7g=="
"version": "6.5.4",
"resolved": "https://registry.npmjs.org/rxjs-compat/-/rxjs-compat-6.5.4.tgz",
"integrity": "sha512-rkn+lbOHUQOurdd74J/hjmDsG9nFx0z66fvnbs8M95nrtKvNqCKdk7iZqdY51CGmDemTQk+kUPy4s8HVOHtkfA=="
},
"safe-buffer": {
"version": "5.1.2",
......@@ -9901,9 +9894,9 @@
},
"dependencies": {
"semver": {
"version": "5.7.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
"integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
"version": "5.7.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
"dev": true
}
}
......
package.json
......@@ -13,41 +13,41 @@
},
"private": true,
"dependencies": {
"@agm/core": "^1.0.0-beta.7",
"@angular/animations": "^8.2.11",
"@agm/core": "^1.1.0",
"@angular/animations": "^8.2.14",
"@angular/common": "~8.1.2",
"@angular/compiler": "~8.1.2",
"@angular/core": "~8.1.2",
"@angular/fire": "^5.2.1",
"@angular/fire": "^5.3.0",
"@angular/forms": "~8.1.2",
"@angular/platform-browser": "~8.1.2",
"@angular/platform-browser-dynamic": "~8.1.2",
"@angular/router": "~8.1.2",
"@ionic-native/core": "^5.0.0",
"@ionic-native/geolocation": "^5.15.1",
"@ionic-native/google-plus": "^5.0.0-beta.0",
"@ionic-native/native-geocoder": "^5.15.1",
"@ionic-native/splash-screen": "^5.0.0",
"@ionic-native/status-bar": "^5.12.0",
"@ionic/angular": "^4.7.1",
"@ionic-native/core": "^5.19.1",
"@ionic-native/geolocation": "^5.19.1",
"@ionic-native/google-plus": "^5.19.1",
"@ionic-native/native-geocoder": "^5.19.1",
"@ionic-native/splash-screen": "^5.19.1",
"@ionic-native/status-bar": "^5.19.1",
"@ionic/angular": "^4.11.8",
"@ionic/storage": "^2.2.0",
"@types/googlemaps": "^3.38.0",
"agm-direction": "^0.7.8",
"@types/googlemaps": "^3.39.2",
"agm-direction": "^0.7.9",
"cordova-android": "8.0.0",
"cordova-plugin-device": "^2.0.3",
"cordova-plugin-geolocation": "^4.0.2",
"cordova-plugin-googleplus": "^8.2.0",
"cordova-plugin-googleplus": "^8.2.1",
"cordova-plugin-ionic-keyboard": "^2.2.0",
"cordova-plugin-ionic-webview": "^4.1.3",
"cordova-plugin-nativegeocoder": "^3.2.2",
"cordova-plugin-splashscreen": "^5.0.3",
"cordova-plugin-statusbar": "^2.4.3",
"cordova-plugin-whitelist": "^1.3.4",
"cordova-sqlite-storage": "^3.4.0",
"core-js": "^2.5.4",
"firebase": "^6.4.0",
"rxjs": "~6.5.1",
"rxjs-compat": "^6.5.3",
"cordova-sqlite-storage": "^3.4.1",
"core-js": "^2.6.11",
"firebase": "^6.6.2",
"rxjs": "^6.5.4",
"rxjs-compat": "^6.5.4",
"tslib": "^1.9.0",
"zone.js": "~0.9.1"
},
......@@ -62,16 +62,16 @@
"@angular/language-service": "~8.1.2",
"@ionic/angular-toolkit": "~2.0.0",
"@types/jasmine": "~3.3.8",
"@types/jasminewd2": "~2.0.3",
"@types/jasminewd2": "^2.0.8",
"@types/node": "~8.9.4",
"codelyzer": "^5.0.0",
"codelyzer": "^5.2.1",
"jasmine-core": "~3.4.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~4.1.0",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "~2.0.1",
"karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "^1.4.0",
"karma-jasmine-html-reporter": "^1.5.1",
"protractor": "~5.4.0",
"ts-node": "~7.0.0",
"tslint": "~5.15.0",
......
src/app/app.component.html
<ion-app>
<ion-split-pane>
<ion-menu>
<ion-content>
<div class="side_menu_wrapper">
<ion-menu-toggle>
<div class="top_banner">
<div class="top_image">
<ion-split-pane>
<ion-menu>
<ion-content>
<div class="side_menu_wrapper">
<ion-menu-toggle>
<div class="top_banner">
<div class="top_image"></div>
<div class="top_detail">
<h4>John Doe</h4>
<p>john@dummymail.com</p>
</div>
<div class="clear"></div>
</div>
</ion-menu-toggle>
<div class="sidemenu_list">
<ul>
<ion-menu-toggle>
<li (click)="vieworder('home')">Shop</li>
</ion-menu-toggle>
<li>About us</li>
<ion-menu-toggle>
<li (click)="vieworder('myorder')">View Order</li>
</ion-menu-toggle>
</div>
<div class="top_detail" >
<h4>John Doe</h4>
<p>john@dummymail.com</p>
</div>
<div class="clear"></div>
</div>
</ion-menu-toggle>
<div class="sidemenu_list">
<ul>
<ion-menu-toggle>
<li (click)="vieworder('home')">Shop</li>
</ion-menu-toggle>
<li>About us</li>
<ion-menu-toggle>
<li (click)="vieworder('myorder')">View Order</li>
</ion-menu-toggle>
<div class="sub_menu">
<ul *ngIf="categoryService.activecategories">
<ion-menu-toggle>
<li *ngFor="let category of categoryService.activecategories" (click)="goToPage('catstorelist', category)">{{category.catName}}</li>
</ion-menu-toggle>
<!-- <li>Women's Fashion</li>
<div class="sub_menu">
<ul *ngIf="categoryService.activecategories">
<ion-menu-toggle>
<li
*ngFor="let category of categoryService.activecategories"
(click)="goToPage('catstorelist', category)"
>
{{ category.catName }}
</li>
</ion-menu-toggle>
<!-- <li>Women's Fashion</li>
<li>Features</li>
<li>Bags</li>
<li>Shoes</li>
<li>Electronics</li> -->
</ul>
</div>
<li>Complaints & Feedback</li>
<li>
<span class="floatLeft" (click)="authService.SignOut()">Logout</span>
<span class="floatRight version">Version 0.1.0.2</span>
<div class="clear"></div>
</li>
</ul>
</div>
</div>
</ion-content>
</ion-menu>
<ion-router-outlet main></ion-router-outlet>
</ion-split-pane>
</ul>
</div>
<li>Complaints & Feedback</li>
<li>
<span class="floatLeft" (click)="authService.SignOut()"
>Logout</span
>
<span class="floatRight version">Version 0.1.0.2</span>
<div class="clear"></div>
</li>
</ul>
</div>
</div>
</ion-content>
</ion-menu>
<ion-router-outlet main></ion-router-outlet>
</ion-split-pane>
</ion-app>
<div class="common_tab" [hidden]="getState()">
<ul>
<li (click)="goToPage('home')">
<div class="icon_sec m1_icon" [class.m1_icon_act]="sec_active1" (click)="setActive1()"></div>
</li>
<li (click)="goToPage('catagory')">
<div class="icon_sec m2_icon" [class.m2_icon_act]="sec_active2" (click)="setActive2()"></div>
</li>
<li (click)="goToPage('catagory')">
<div class="icon_sec m3_icon" [class.m3_icon_act]="sec_active3" (click)="setActive3()"></div>
</li>
<!-- <li (click)="goToPage('cart')">
<ul>
<li (click)="goToPage('home')">
<div
class="icon_sec m1_icon"
[class.m1_icon_act]="sec_active1"
(click)="setActive1()"
></div>
</li>
<li (click)="goToPage('catagory')">
<div
class="icon_sec m2_icon"
[class.m2_icon_act]="sec_active2"
(click)="setActive2()"
></div>
</li>
<li (click)="goToPage('catagory')">
<div
class="icon_sec m3_icon"
[class.m3_icon_act]="sec_active3"
(click)="setActive3()"
></div>
</li>
<!-- <li (click)="goToPage('cart')">
<div class="icon_sec m4_icon" [class.m4_icon_act]="sec_active4" (click)="setActive4()"></div>
</li> -->
<li (click)="goToPage('myorder')">
<div class="icon_sec m5_icon" [class.m5_icon_act]="sec_active5" (click)="setActive5()"></div>
</li>
<li (click)="goToPage('profile')">
<div class="icon_sec m6_icon" [class.m6_icon_act]="sec_active6" (click)="setActive6()"></div>
</li>
</ul>
</div>
\ No newline at end of file
<li (click)="goToPage('myorder')">
<div
class="icon_sec m5_icon"
[class.m5_icon_act]="sec_active5"
(click)="setActive5()"
></div>
</li>
<li (click)="goToPage('profile')">
<div
class="icon_sec m6_icon"
[class.m6_icon_act]="sec_active6"
(click)="setActive6()"
></div>
</li>
</ul>
</div>
src/app/changedetails/changedetails.page.html
<div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" />
</button>
<div class="nav_title floatLeft">
<h4>CHANGE DETAILS</h4>
</div>
<div class="clear"></div>
<div class="nav_title floatLeft">
<h4>CHANGE DETAILS</h4>
</div>
<div class="clear"></div>
</div>
<ion-content>
<div class="login_wrapper">
<div class="form_div">
<div class="row">
<h6>Personal Details</h6>
</div>
<div class="row">
<input class="" type="text" placeholder="John Doe">
</div>
<div class="row">
<input class="" type="mail" placeholder="johndoe@dummymail.com">
</div>
<div class="row">
<input class="" type="number" placeholder="+00 9851 5871 6985">
</div>
<div class="row">
<h6>Change Password</h6>
</div>
<div class="row">
<input class="" type="password" placeholder="Current Password">
</div>
<div class="row">
<input class="" type="password" placeholder="New Password">
</div>
<div class="row">
<input class="" type="password" placeholder="Confirm Password">
</div>
<div class="row">
<button class="login_btn">UPDATE</button>
</div>
<div class="login_wrapper">
<form class="form_div" #updateForm="ngForm" novalidate>
<div class="row">
<h6>Personal Details</h6>
</div>
<div class="row">
<input
name="name"
required
class=""
type="text"
[(ngModel)]="updateData.name"
placeholder="John Doe"
#name="ngModel"
/>
<div
class="md-errors-spacer"
[hidden]="name.valid || submitted == false"
class="ion-padding-start"
>
Name is required
</div>
</div>
</ion-content>
\ No newline at end of file
</div>
<div class="row">
<input
required
class=""
name="emailId"
type="mail"
[(ngModel)]="updateData.emailId"
placeholder="johndoe@dummymail.com"
pattern="[a-zA-Z0-9.-_]{1,}@[a-zA-Z.-]{2,}[.]{1}[a-zA-Z]{2,}"
#emailId="ngModel"
/>
<div
class="md-errors-spacer"
[hidden]="emailId.valid || submitted == false"
>
<div *ngIf="emailId.errors && emailId.errors.required">
Email is required
</div>
<div *ngIf="emailId.errors && emailId.errors.pattern">
Email is invalid
</div>
</div>
</div>
<div class="row">
<input
required
class=""
name="phone"
type="number"
pattern="(\(+61\)|\+61|\(0[1-9]\)|0[1-9])?( ?-?[0-9]){6,9}"
maxlength="10"
[(ngModel)]="updateData.phone"
placeholder="+00 9851 5871 6985"
#phone="ngModel"
/>
<div
class="md-errors-spacer"
[hidden]="phone.valid || submitted == false"
>
<div *ngIf="phone.errors && phone.errors.required">
Phone number is required
</div>
<div *ngIf="phone.errors && phone.errors.pattern">
Phone is invalid
</div>
</div>
</div>
<div class="row">
<h6>Change Password</h6>
</div>
<div class="row">
<input class="" type="password" placeholder="Current Password" />
</div>
<div class="row">
<input class="" type="password" placeholder="New Password" />
</div>
<div class="row">
<input class="" type="password" placeholder="Confirm Password" />
</div>
<div class="row">
<button class="login_btn" (click)="onFormSubmit(updateForm)">
UPDATE
</button>
</div>
</form>
</div>
</ion-content>
src/app/changedetails/changedetails.page.ts
import { Component, OnInit } from '@angular/core';
import { Location } from '@angular/common';
import { Router, ActivatedRoute } from '@angular/router';
import { Component, OnInit } from "@angular/core";
import { Location } from "@angular/common";
import { Router, ActivatedRoute } from "@angular/router";
import { UpdateUserDetails } from "../../config/services/user";
import { UpdateService } from "../../config/update.service";
import { ServiceService } from "../../config/service.service";
import { NgForm } from "@angular/forms";
@Component({
selector: 'app-changedetails',
templateUrl: './changedetails.page.html',
styleUrls: ['./changedetails.page.scss'],
selector: "app-changedetails",
templateUrl: "./changedetails.page.html",
styleUrls: ["./changedetails.page.scss"]
})
export class ChangedetailsPage implements OnInit {
userData: any;
updateData: UpdateUserDetails = {
emailId: "",
name: "",
phone: ""
};
submitted = false;
constructor(
private router: Router,
private route: ActivatedRoute,
private location: Location
) { }
ngOnInit() {
private location: Location,
public register: UpdateService,
private service: ServiceService
) {
this.service.get("params").then(val => {
this.userData = val;
});
}
ngOnInit() {}
goToPage(path, data = null) {
this.router.navigateByUrl(path, { queryParams: data });
......@@ -29,4 +43,11 @@ export class ChangedetailsPage implements OnInit {
this.location.back();
}
onFormSubmit(form: NgForm) {
this.submitted = true;
if (form.valid) {
console.log("valid form values", form.value);
this.register.updateData(form.value, this.userData.uid);
}
}
}
src/app/home/home.page.ts
import { Component, OnInit } from "@angular/core";
import { Location } from "@angular/common";
import { trigger, transition, animate, style } from "@angular/animations";
import { MapsAPILoader, MouseEvent } from "@agm/core";
import { Router, ActivatedRoute } from "@angular/router";
import { MenuController } from "@ionic/angular";
import { CenterService } from "./../../config/center.service";
import { ShoppersService } from "./../../config/shopper.service";
import { CategoriesService } from "./../../config/category.service";
import { ServiceService } from "./../../config/service.service";
import { AddressService } from "./../../config/address.service";
import { SearchService } from "./../../config/search.service";
import { ProductsService } from "./../../config/products.service";
import { from } from "rxjs";
import { ModalController } from "@ionic/angular";
import { SearchmodalPage } from "../searchmodal/searchmodal.page";
import { Component, OnInit } from '@angular/core';
import { Location } from '@angular/common';
import { trigger, transition, animate, style } from '@angular/animations';
import { MapsAPILoader, MouseEvent } from '@agm/core';
import { Router, ActivatedRoute } from '@angular/router';
import { MenuController } from '@ionic/angular';
import { CenterService } from './../../config/center.service';
import { ShoppersService } from './../../config/shopper.service';
import { CategoriesService } from './../../config/category.service';
import { ServiceService } from './../../config/service.service';
import { AddressService } from './../../config/address.service';
import { SearchService } from './../../config/search.service';
import { ProductsService } from './../../config/products.service';
import { from } from 'rxjs';
import { ModalController } from '@ionic/angular';
import { SearchmodalPage } from '../searchmodal/searchmodal.page';
@Component({
selector: "app-home",
templateUrl: "./home.page.html",
styleUrls: ["./home.page.scss"],
selector: 'app-home',
templateUrl: './home.page.html',
styleUrls: ['./home.page.scss'],
animations: [
trigger("slideInOut", [
transition(":enter", [
style({ transform: "translateY(100%)" }),
animate("200ms ease-in", style({ transform: "translateY(0%)" }))
trigger('slideInOut', [
transition(':enter', [
style({ transform: 'translateY(100%)' }),
animate('200ms ease-in', style({ transform: 'translateY(0%)' }))
]),
transition(":leave", [
animate("200ms ease-out", style({ transform: "translateY(100%)" }))
transition(':leave', [
animate('200ms ease-out', style({ transform: 'translateY(100%)' }))
])
])
]
......@@ -65,7 +65,7 @@ export class HomePage implements OnInit {
this.geoCoder = new google.maps.Geocoder();
});
this.menuCtrl.enable(true);
const users = this.service.get("user").then(data => {
const users = this.service.get('user').then(data => {
if (data) {
data = JSON.parse(data);
this.custId = data.uid;
......@@ -75,7 +75,7 @@ export class HomePage implements OnInit {
}
private setCurrentLocation() {
if ("geolocation" in navigator) {
if ('geolocation' in navigator) {
navigator.geolocation.getCurrentPosition(position => {
this.lat = position.coords.latitude;
this.lng = position.coords.longitude;
......@@ -90,16 +90,16 @@ export class HomePage implements OnInit {
(results, status) => {
console.log(results);
console.log(status);
if (status === "OK") {
if (status === 'OK') {
if (results[0]) {
const addressData = results[0].formatted_address.split(", ");
this.address = addressData[0] + ", " + addressData[1];
const addressData = results[0].formatted_address.split(', ');
this.address = addressData[0] + ', ' + addressData[1];
console.log(this.address);
} else {
window.alert("No results found");
window.alert('No results found');
}
} else {
window.alert("Geocoder failed due to: " + status);
window.alert('Geocoder failed due to: ' + status);
}
}
);
......@@ -124,7 +124,7 @@ export class HomePage implements OnInit {
goToPage(path, data = null) {
console.log(data);
this.service.set("params", data);
this.service.set('params', data);
this.router.navigateByUrl(path, { queryParams: data });
document.body.scrollTop = document.documentElement.scrollTop = 0;
}
......@@ -141,19 +141,19 @@ export class HomePage implements OnInit {
console.log(datas);
let data;
let url;
if (datas.type === "shopper") {
if (datas.type === 'shopper') {
data = datas.data;
this.service.set("params", data);
url = "productlist";
} else if (datas.type === "category") {
this.service.set('params', data);
url = 'productlist';
} else if (datas.type === 'category') {
data = datas.data;
this.service.set("params", data);
url = "catstorelist";
this.service.set('params', data);
url = 'catstorelist';
} else {
data = datas.data;
data.size = this.service.splitSep(data.size);
data.tag = this.service.splitSep(data.tag);
(data.color = this.service.splitSep(data.color)), (url = "productdetail");
(data.color = this.service.splitSep(data.color)), (url = 'productdetail');
this.productsService.setProd(data);
}
this.searchClose();
......@@ -162,6 +162,7 @@ export class HomePage implements OnInit {
}
searchFun(data: string) {
this.searchShow = true;
this.searchService.search(data);
}
......
src/app/productdetail/productdetail.page.html
<div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png">
</button>
<div class="nav_title floatLeft">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" />
</button>
<div class="nav_title floatLeft"></div>
<button class="nav_btn nav_cart floatRight" (click)="goToPage('cart')">
<div class="not" *ngIf="cartService.carts">
{{cartService.carts.length}}
</div>
<button class="nav_btn nav_cart floatRight" (click)="goToPage('cart')">
<div class="not" *ngIf="cartService.carts">{{cartService.carts.length}}</div>
</button>
<div class="clear"></div>
</button>
<div class="clear"></div>
</div>
<ion-content>
<div class="product_detail_wrapper" *ngIf="product">
<div class="product_banner">
<div [ngClass]="checkFavStatus(product.prodId)" (click)="changeFav(product.prodId)"></div>
<div class="featured_badge" *ngIf="product.featured">Featured</div>
<ion-slides pager="true" [options]="bannerOptions">
<ion-slide>
<img [src]="product.image" onerror="this.src='../assets/model1@3x.jpg'">
</ion-slide>
<ion-slide>
<img [src]="product.image" onerror="this.src='../assets/model1@3x.jpg'">
</ion-slide>
<ion-slide>
<img [src]="product.image" onerror="this.src='../assets/model1@3x.jpg'">
</ion-slide>
</ion-slides>
</div>
<div class="product_header">
<ion-row>
<ion-col size="8">
<h3>{{product.prodName}}</h3>
<p><strong><span><img src="../assets/Path61_2.png"></span>0</strong>&nbsp; {{product.category}}, {{product.subCate}}
<br />
<span *ngFor="let tag of product.tag">#{{tag}}&nbsp;</span>
</p>
</ion-col>
<ion-col size="4">
<h5>A$ {{product.price}}</h5>
<p><span class="offer" *ngIf="product.discount > 0">-{{product.discount}}%</span></p>
</ion-col>
</ion-row>
</div>
<div class="product_detail_wrapper" *ngIf="product">
<div class="product_banner">
<div
[ngClass]="checkFavStatus(product.prodId)"
(click)="changeFav(product.prodId)"
></div>
<div class="featured_badge" *ngIf="product.featured">Featured</div>
<ion-slides pager="true" [options]="bannerOptions">
<ion-slide>
<img
[src]="product.image"
onerror="this.src='../assets/model1@3x.jpg'"
/>
</ion-slide>
<ion-slide>
<img
[src]="product.image"
onerror="this.src='../assets/model1@3x.jpg'"
/>
</ion-slide>
<ion-slide>
<img
[src]="product.image"
onerror="this.src='../assets/model1@3x.jpg'"
/>
</ion-slide>
</ion-slides>
</div>
<div class="product_header">
<ion-row>
<ion-col size="8">
<h3>{{product.prodName}}</h3>
<p>
<strong
><span><img src="../assets/Path61_2.png"/></span>0</strong
>&nbsp; {{product.category}}, {{product.subCate}}
<br />
<span *ngFor="let tag of product.tag">#{{tag}}&nbsp;</span>
</p>
</ion-col>
<ion-col size="4">
<h5>A$ {{product.price}}</h5>
<p>
<span class="offer" *ngIf="product.discount > 0"
>-{{product.discount}}%</span
>
</p>
</ion-col>
</ion-row>
</div>
<div class="product_div_content">
<h5>Color</h5>
<div class="size_div">
<ul *ngIf="product.size">
<ion-slides pager="false" [options]="slideOpts">
<ion-slide *ngFor="let color of product.color; let i = index">
<li>
<button id="custom_check_button">
<label>
<input id="{{color}}" type="radio" name="color" value="{{color}}"
(click)="cartService.choose_color(color)" [checked]="i==0">
<p>{{color}}</p>
</label>
</button>
</li>
</ion-slide>
</ion-slides>
</ul>
</div>
<h5>Size</h5>
<div class="size_div">
<ul *ngIf="product.size">
<ion-slides pager="false" [options]="slideOpts">
<ion-slide *ngFor="let size of product.size; let i = index">
<li>
<button id="custom_check_button">
<label>
<input id="{{size}}" type="radio" name="services" value="{{size}}"
(click)="cartService.choose_size(size)" [checked]="i==0">
<p>{{size}}</p>
</label>
</button>
</li>
</ion-slide>
</ion-slides>
</ul>
</div>
<!-- <h5>Color</h5>
<div class="product_div_content">
<h5>Color</h5>
<div class="size_div">
<ul *ngIf="product.size">
<ion-slides pager="false" [options]="slideOpts">
<ion-slide *ngFor="let color of product.color; let i = index">
<li>
<button id="custom_check_button">
<label>
<input
id="{{color}}"
type="radio"
name="color"
value="{{color}}"
(click)="cartService.choose_color(color)"
[checked]="i==0"
/>
<p>{{color}}</p>
</label>
</button>
</li>
</ion-slide>
</ion-slides>
</ul>
</div>
<h5>Size</h5>
<div class="size_div">
<ul *ngIf="product.size">
<ion-slides pager="false" [options]="slideOpts">
<ion-slide *ngFor="let size of product.size; let i = index">
<li>
<button id="custom_check_button">
<label>
<input
id="{{size}}"
type="radio"
name="services"
value="{{size}}"
(click)="cartService.choose_size(size)"
[checked]="i==0"
/>
<p>{{size}}</p>
</label>
</button>
</li>
</ion-slide>
</ion-slides>
</ul>
</div>
<!-- <h5>Color</h5>
<div class="color_div">
<ul>
<ion-slides pager="false" [options]="slideOpts">
......@@ -136,10 +168,9 @@
</ion-slides>
</ul>
</div> -->
<h5>Description</h5>
<p>{{product.prodDesc}}
</p>
<!--<h5>
<h5>Description</h5>
<p>{{product.prodDesc}}</p>
<!--<h5>
<span class="floatLeft">Reviews</span><span class="floatRight" (click)="goToPage('reviewlist')">MORE</span>
<div class="clear"></div>
</h5>
......@@ -203,38 +234,45 @@
</li>
</ul>
</div> -->
<h5 *ngIf="product.similar && product.similar.length > 0">
<span class="floatLeft">Related Products</span><span class="floatRight" (click)="goToPage('productlist', data)">MORE</span>
<div class="clear"></div>
</h5>
<div class="related_product_slider">
<ul *ngIf="product.similar && product.similar.length > 0">
<ion-slides pager="false" [options]="relatedProd">
<ion-slide *ngFor="let similar of product.similar">
<li (click)="viewProd(similar)">
<div class="product_image">
<img [src]="similar.image" onerror="this.src='../assets/model1@3x.png'">
<div [ngClass]="checkFavStatus(similar.prodId)" (click)="changeFav(similar.prodId)">
</div>
</div>
<h5>{{similar.prodName}}</h5>
<p>{{similar.price}}</p>
</li>
</ion-slide>
</ion-slides>
</ul>
</div>
</div>
<h5 *ngIf="product.similar && product.similar.length > 0">
<span class="floatLeft">Related Products</span
><span class="floatRight" (click)="goToPage('productlist', data)"
>MORE</span
>
<div class="clear"></div>
</h5>
<div class="related_product_slider">
<ul *ngIf="product.similar && product.similar.length > 0">
<ion-slides pager="false" [options]="relatedProd">
<ion-slide *ngFor="let similar of product.similar">
<li (click)="viewProd(similar)">
<div class="product_image">
<img
[src]="similar.image"
onerror="this.src='../assets/model1@3x.png'"
/>
<div
[ngClass]="checkFavStatus(similar.prodId)"
(click)="changeFav(similar.prodId)"
></div>
</div>
<h5>{{similar.prodName}}</h5>
<p>{{similar.price}}</p>
</li>
</ion-slide>
</ion-slides>
</ul>
</div>
</div>
</div>
</ion-content>
<ion-footer>
<div class="footer_div">
<div class="footer_options">
<button class="share"></button>
<button class="fav"></button>
<button class="cart" (click)="buyNow(product,0)"></button>
</div>
<div class="footer_btn" (click)="buyNow(product,1)">BUY NOW</div>
<div class="footer_div">
<div class="footer_options">
<button class="share"></button>
<button class="fav"></button>
<button class="cart" (click)="buyNow(product,0)"></button>
</div>
</ion-footer>
\ No newline at end of file
<div class="footer_btn" (click)="buyNow(product,1)">BUY NOW</div>
</div>
</ion-footer>
src/app/productdetail/productdetail.page.ts
import { Component, OnInit } from '@angular/core';
import { Location } from '@angular/common';
import { Router, ActivatedRoute } from '@angular/router';
import { Products } from './../../config/services/product';
import { Order } from './../../config/services/order';
import { CartsService } from './../../config/cart.service';
import { ProductsService } from './../../config/products.service';
import { ServiceService } from './../../config/service.service';
import { map } from 'rxjs/operators';
import { Component, OnInit } from "@angular/core";
import { Location } from "@angular/common";
import { Router, ActivatedRoute } from "@angular/router";
import { Products } from "./../../config/services/product";
import { Slides } from "./../../config/services/slides";
import { Order } from "./../../config/services/order";
import { CartsService } from "./../../config/cart.service";
import { ProductsService } from "./../../config/products.service";
import { ServiceService } from "./../../config/service.service";
import { map } from "rxjs/operators";
@Component({
selector: 'app-productdetail',
templateUrl: './productdetail.page.html',
styleUrls: ['./productdetail.page.scss']
selector: "app-productdetail",
templateUrl: "./productdetail.page.html",
styleUrls: ["./productdetail.page.scss"]
})
export class ProductdetailPage implements OnInit {
slide: Slides;
product: Products;
order: Order;
data: any;
slideData: any;
bannerOptions = {
slidesPerView: 1,
......@@ -47,15 +51,25 @@ export class ProductdetailPage implements OnInit {
params.subCate,
params.prodId
);
this.service.get('params').then(val => {
this.service.get("params").then(val => {
this.data = val;
});
//
this.prodService
.getProdSlide(this.prodService.selItem.skuCode)
.then(res => {
this.slideData = res;
// console.log("resData", res);
});
this.cartService.cartList();
console.log(this.prodService.fav);
// console.log(this.prodService.fav);
}
ngOnInit() {
console.log(this.prodService.selItem);
// console.log("[qwe]", this.prodService.selItem);
const params = this.prodService.selItem;
this.getProd(params);
}
......@@ -88,14 +102,14 @@ export class ProductdetailPage implements OnInit {
} else {
this.product = undefined;
}
console.log(this.product);
// console.log(this.product.image);
}
stringObject(items: any) {
items.forEach(element => {
console.log(element.sizeId);
// console.log(element.sizeId);
element = JSON.parse(element);
console.log(element);
// console.log(element);
});
}
......@@ -112,7 +126,7 @@ export class ProductdetailPage implements OnInit {
buyNow(product: any, type: number) {
this.cartService.buyNow(product).then(() => {
if (type === 1) {
this.router.navigateByUrl('cart');
this.router.navigateByUrl("cart");
} else {
// alert('Product added to cart');
}
......@@ -126,21 +140,21 @@ export class ProductdetailPage implements OnInit {
checkFavStatus(index) {
const state = this.prodService.fav.findIndex(x => x === index);
return state > -1 ? 'fav_fill' : 'fav_icon';
return state > -1 ? "fav_fill" : "fav_icon";
}
changeFav(index) {
const state = this.prodService.fav.findIndex(x => x === index);
console.log(state);
console.log(this.prodService.fav);
// console.log(state);
// console.log(this.prodService.fav);
if (state > -1) {
this.prodService.fav.splice(state, 1);
this.prodService.changeFav(index, 'yes');
this.prodService.changeFav(index, "yes");
} else {
this.prodService.fav.push(index);
this.prodService.changeFav(index, 'no');
this.prodService.changeFav(index, "no");
}
return;
console.log(this.prodService.fav);
// console.log(this.prodService.fav);
}
}
src/app/profile/profile.page.html
<div class="nav_header">
<ion-menu-toggle>
<button class="nav_btn nav_menu floatLeft">
</button>
</ion-menu-toggle>
<div class="nav_title floatLeft">
<img src="../../assets/Group 11@3x.png">
</div>
<div class="clear"></div>
<ion-menu-toggle>
<button class="nav_btn nav_menu floatLeft"></button>
</ion-menu-toggle>
<div class="nav_title floatLeft">
<img src="../../assets/Group 11@3x.png" />
</div>
<div class="clear"></div>
</div>
<ion-content>
<div class="profile_wrapper">
<div class="profile_banner">
<div class="profile_circle">
<div class="edit"></div>
</div>
<h5>JOHN DOE</h5>
<p>LOGOUT</p>
</div>
<div class="account_wrapper">
<div class="account_header">
<h5 class="floatLeft">ACCOUNT INFORMATION</h5>
<span class="floatRight"><img src="../../assets/edit.png"></span>
<div class="clear"></div>
</div>
<div class="row">
<ion-row>
<ion-col class="textLeft p0">
<p>Name<span>Verfied</span></p>
</ion-col>
<ion-col class="textRight p0">
<h6>John Doe</h6>
</ion-col>
</ion-row>
</div>
<div class="row">
<ion-row>
<ion-col class="textLeft p0">
<p>Email<span>Not Verfied yet</span></p>
</ion-col>
<ion-col class="textRight p0">
<h6>johndoe@compnay.in</h6>
</ion-col>
</ion-row>
</div>
<hr>
<ion-row>
<ion-col class="textLeft p0">
<p>Wishlist</p>
</ion-col>
<ion-col class="textRight p0">
<h6>(3)</h6>
</ion-col>
</ion-row>
<hr>
<ion-row>
<ion-col class="textLeft p0">
<p>Address</p>
</ion-col>
<ion-col class="textRight p0">
<h6>(1)</h6>
</ion-col>
</ion-row>
<hr>
<ion-row>
<ion-col class="textLeft p0">
<p>My Cards</p>
</ion-col>
<ion-col class="textRight p0">
<h6>
<ion-icon name="arrow-forward"></ion-icon>
</h6>
</ion-col>
</ion-row>
<hr>
<ion-row>
<ion-col class="textLeft p0">
<p>My Order</p>
</ion-col>
<ion-col class="textRight p0">
<h6>
<ion-icon name="arrow-forward"></ion-icon>
</h6>
</ion-col>
</ion-row>
<hr>
<ion-row>
<ion-col class="textLeft p0">
<p>Currency</p>
</ion-col>
<ion-col class="textRight p0">
<h6>
<span>AUD</span>
</h6>
</ion-col>
</ion-row>
</div>
<div class="profile_wrapper">
<div class="profile_banner">
<div class="profile_circle">
<div class="edit"></div>
</div>
<h5>{{user && user.name}}</h5>
<p>LOGOUT</p>
</div>
<div class="account_wrapper">
<div class="account_header">
<h5 class="floatLeft">ACCOUNT INFORMATION</h5>
<span
class="floatRight"
(click)="goToPage('changedetails', user && user)"
><img src="../../assets/edit.png"
/></span>
<div class="clear"></div>
</div>
<div class="row">
<ion-row>
<ion-col class="textLeft p0">
<p>
Name<span
>{{user && phoneVerified? "Verified": "Not Verified yet"}}</span
>
</p>
</ion-col>
<ion-col class="textRight p0">
<h6>{{user && user.name}}</h6>
</ion-col>
</ion-row>
</div>
<div class="row">
<ion-row>
<ion-col class="textLeft p0">
<p>
Email<span
>{{user && emailVerified? "Verified": "Not Verified yet"}}</span
>
</p>
</ion-col>
<ion-col class="textRight p0">
<h6>{{user && user.emailId}}</h6>
</ion-col>
</ion-row>
</div>
<hr />
<ion-row>
<ion-col class="textLeft p0">
<p>Wishlist</p>
</ion-col>
<ion-col class="textRight p0">
<h6>(3)</h6>
</ion-col>
</ion-row>
<hr />
<ion-row>
<ion-col class="textLeft p0">
<p>Address</p>
</ion-col>
<ion-col class="textRight p0">
<h6>(1)</h6>
</ion-col>
</ion-row>
<hr />
<ion-row>
<ion-col class="textLeft p0">
<p>My Cards</p>
</ion-col>
<ion-col class="textRight p0">
<h6>
<ion-icon name="arrow-forward"></ion-icon>
</h6>
</ion-col>
</ion-row>
<hr />
<ion-row>
<ion-col class="textLeft p0">
<p>My Order</p>
</ion-col>
<ion-col class="textRight p0">
<h6>
<ion-icon name="arrow-forward"></ion-icon>
</h6>
</ion-col>
</ion-row>
<hr />
<ion-row>
<ion-col class="textLeft p0">
<p>Currency</p>
</ion-col>
<ion-col class="textRight p0">
<h6>
<span>AUD</span>
</h6>
</ion-col>
</ion-row>
</div>
</ion-content>
\ No newline at end of file
</div>
</ion-content>
src/app/profile/profile.page.ts
import { Component, OnInit } from '@angular/core';
import { Component, OnInit } from "@angular/core";
import { User } from "../../config/services/user";
import { UserService } from "../../config/user.service";
import { ServiceService } from "../../config/service.service";
import { Router, ActivatedRoute } from "@angular/router";
@Component({
selector: 'app-profile',
templateUrl: './profile.page.html',
styleUrls: ['./profile.page.scss'],
selector: "app-profile",
templateUrl: "./profile.page.html",
styleUrls: ["./profile.page.scss"]
})
export class ProfilePage implements OnInit {
user: User;
userdata: any;
custId: String;
constructor() { }
constructor(
private router: Router,
private useService: UserService,
private service: ServiceService
) {
const params = this.useService.users;
const userdata = this.service.get("user").then(data => {
if (data) {
data = JSON.parse(data);
this.service.set("params", data);
ngOnInit() {
this.custId = data.uid;
}
});
this.useService.getUserData("9cYSZwGvVpgkUHVcz8Dm6oqGX152");
// .then(res => {
// console.log("asdasda", res);
// this.userdata = res;
// });
}
goToPage(path, data = null) {
this.router.navigateByUrl(path, { queryParams: data });
document.body.scrollTop = document.documentElement.scrollTop = 0;
}
ngOnInit() {
let This = this;
setTimeout(() => {
this.user = this.useService.users;
console.log("[users]", this.user);
this.service.set("params", this.user);
}, 500);
}
}
src/app/searchmodal/searchmodal.page.html
......@@ -2,27 +2,14 @@
<button class="nav_btn nav_back floatLeft" (click)="closeModal()">
</button>
<div class="nav_title floatLeft relative">
<input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc...">
<input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..." (click)="clickSearch()" (input)="searchFun($event.target.value)" #searchText>
</div>
<button class="nav_btn nav_close floatRight" (click)="closeModal()">
</button>
<div class="clear"></div>
</div>
<div class="search_item_list">
<ul>
<li>Item </li>
<li>Item </li>
<li>Item </li>
<li>Item </li>
<li>Item </li>
<li>Item </li>
<li>Item </li>
<li>Item </li>
<li>Item </li>
<li>Item </li>
<li>Item </li>
<li>Item </li>
<li>Item </li>
<li>Item </li>
<ul *ngIf="searchService.searchList">
<li *ngFor="let search of searchService.searchList" (click)="viewPage(search)">{{search.text}} </li>
</ul>
</div>
\ No newline at end of file
src/app/searchmodal/searchmodal.page.ts
import { Component, OnInit } from "@angular/core";
import { ModalController, NavParams } from "@ionic/angular";
import { Component, OnInit } from '@angular/core';
import { Router, ActivatedRoute } from '@angular/router';
import { ModalController, NavParams } from '@ionic/angular';
import { SearchService } from './../../config/search.service';
import { ServiceService } from './../../config/service.service';
import { ProductsService } from './../../config/products.service';
@Component({
selector: "app-searchmodal",
templateUrl: "./searchmodal.page.html",
styleUrls: ["./searchmodal.page.scss"]
selector: 'app-searchmodal',
templateUrl: './searchmodal.page.html',
styleUrls: ['./searchmodal.page.scss']
})
export class SearchmodalPage implements OnInit {
searchShow = false;
constructor(
private modalController: ModalController,
private navParams: NavParams
private navParams: NavParams,
private searchService: SearchService,
public service: ServiceService,
private productsService: ProductsService,
private router: Router
) {}
ngOnInit() {}
ngOnInit() {
this.searchService.searchList = [];
}
async closeModal() {
await this.modalController.dismiss();
}
searchFun(data: string) {
this.searchShow = true;
this.searchService.search(data);
}
clickSearch() {
this.searchShow = true;
this.searchService.searchList = [];
}
viewPage(datas: any) {
this.closeModal();
console.log(datas);
let data;
let url;
if (datas.type === 'shopper') {
data = datas.data;
this.service.set('params', data);
url = 'productlist';
} else if (datas.type === 'category') {
data = datas.data;
this.service.set('params', data);
url = 'catstorelist';
} else {
data = datas.data;
data.size = this.service.splitSep(data.size);
data.tag = this.service.splitSep(data.tag);
(data.color = this.service.splitSep(data.color)), (url = 'productdetail');
this.productsService.setProd(data);
}
this.searchClose();
this.router.navigateByUrl(url, { queryParams: data });
document.body.scrollTop = document.documentElement.scrollTop = 0;
}
searchClose() {
this.closeModal();
this.searchShow = false;
}
}
src/app/signup/signup.page.html
<div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png">
</button>
<div class="nav_title floatLeft">
<h4>SIGN UP</h4>
</div>
<div class="clear"></div>
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" />
</button>
<div class="nav_title floatLeft">
<h4>SIGN UP</h4>
</div>
<div class="clear"></div>
</div>
<ion-content>
<div class="login_wrapper">
<div class="logo_wrapper">
<img src="../assets/logo.png">
<div class="login_wrapper">
<div class="logo_wrapper">
<img src="../assets/logo.png" />
</div>
<div class="form_div">
<form #signupForm="ngForm" novalidate>
<div class="row">
<input
class=""
type="text"
placeholder="Your name"
[(ngModel)]="signup.name"
name="name"
#name="ngModel"
required
/>
<div
class="md-errors-spacer"
[hidden]="name.valid || submitted == false"
class="ion-padding-start"
>
Name is required
</div>
</div>
<div class="form_div">
<form #signupForm="ngForm" novalidate>
<div class="row">
<input class="" type="text" placeholder="Your name" [(ngModel)]="signup.name" name="name" #name="ngModel" required>
<div class="md-errors-spacer" [hidden]="name.valid || submitted == false" class="ion-padding-start">
Name is required
</div>
</div>
<div class="row">
<input class="" type="email" placeholder="Email Address" [(ngModel)]="signup.emailId" name="emailId" #emailId="ngModel" email pattern="[a-zA-Z0-9.-_]{1,}@[a-zA-Z.-]{2,}[.]{1}[a-zA-Z]{2,}" required>
<div class="md-errors-spacer" [hidden]="emailId.valid || submitted == false">
<div *ngIf="emailId.errors && emailId.errors.required">
Email is required
</div>
<div *ngIf="emailId.errors && emailId.errors.pattern">
Email is invalid
</div>
</div>
<div class="row">
<input
class=""
type="email"
placeholder="Email Address"
[(ngModel)]="signup.emailId"
name="emailId"
#emailId="ngModel"
email
pattern="[a-zA-Z0-9.-_]{1,}@[a-zA-Z.-]{2,}[.]{1}[a-zA-Z]{2,}"
required
/>
<div
class="md-errors-spacer"
[hidden]="emailId.valid || submitted == false"
>
<div *ngIf="emailId.errors && emailId.errors.required">
Email is required
</div>
<div class="row">
<input class="" type="text" placeholder="Phone number" [(ngModel)]="signup.phone" name="phone" #phone="ngModel" pattern="(\(+61\)|\+61|\(0[1-9]\)|0[1-9])?( ?-?[0-9]){6,9}" maxlength="10" required>
<div class="md-errors-spacer" [hidden]="phone.valid || submitted == false">
<div *ngIf="phone.errors && phone.errors.required">
Phone number is required
</div>
<div *ngIf="phone.errors && phone.errors.pattern">
Phone is invalid
</div>
</div>
<div *ngIf="emailId.errors && emailId.errors.pattern">
Email is invalid
</div>
<div class="row">
<input class="" type="password" placeholder="Create A Password" [(ngModel)]="signup.password" name="password" #password="ngModel" minlength="6" required>
<div class="md-errors-spacer" [hidden]="password.valid || submitted == false">
<div *ngIf="password.errors && password.errors.required">Password is required</div>
<div *ngIf="password.errors && password.errors.minlength">Password must be at least 6 characters</div>
</div>
</div>
<div class="row">
<ion-datetime displayFormat="DD-MM-YYYY" [(ngModel)]="signup.dob" name="dob" #dob="ngModel" placeholder="Date of Birth" max="{{minDate}}" required></ion-datetime>
<div class="md-errors-spacer" [hidden]="dob.valid || submitted == false">
<div *ngIf="dob.errors && dob.errors.required">DOB is required</div>
</div>
</div>
</div>
<div class="row">
<input
class=""
type="text"
placeholder="Phone number"
[(ngModel)]="signup.phone"
name="phone"
#phone="ngModel"
pattern="(\(+61\)|\+61|\(0[1-9]\)|0[1-9])?( ?-?[0-9]){6,9}"
maxlength="10"
required
/>
<div
class="md-errors-spacer"
[hidden]="phone.valid || submitted == false"
>
<div *ngIf="phone.errors && phone.errors.required">
Phone number is required
</div>
<div class="row">
<h6>
<input class="styled-checkbox" id="styled-checkbox-1" type="checkbox" value="true" [(ngModel)]="signup.terms" required name="terms" #terms="ngModel">
<label for="styled-checkbox-1"><span>I agree with <a (click)="menuToggle()">Terms and
Conditions</a></span></label></h6>
<div class="md-errors-spacer" [hidden]="terms.valid || submitted == false">
<div *ngIf="terms.errors && terms.errors.required">Please accept Terms and Conditions</div>
</div>
<div *ngIf="phone.errors && phone.errors.pattern">
Phone is invalid
</div>
<div class="row">
<button class="login_btn" (click)="onSignup(signupForm)">SIGN UP</button>
</div>
</div>
<div class="row">
<input
class=""
type="password"
placeholder="Create A Password"
[(ngModel)]="signup.password"
name="password"
#password="ngModel"
minlength="6"
required
/>
<div
class="md-errors-spacer"
[hidden]="password.valid || submitted == false"
>
<div *ngIf="password.errors && password.errors.required">
Password is required
</div>
</form>
<div class="row">
<hr>
<p><span>OR</span></p>
<div *ngIf="password.errors && password.errors.minlength">
Password must be at least 6 characters
</div>
<div class="row">
<div class="social_div">
<div class="social_btn" style="border-right:1px solid rgba(215, 213, 228, 1);" (click)="register.facebook()">
Facebook
</div>
<div class="social_btn" (click)="register.google(2)">
Google
</div>
</div>
</div>
</div>
<div class="row">
<ion-datetime
displayFormat="DD-MM-YYYY"
[(ngModel)]="signup.dob"
name="dob"
#dob="ngModel"
placeholder="Date of Birth"
max="{{minDate}}"
required
></ion-datetime>
<div
class="md-errors-spacer"
[hidden]="dob.valid || submitted == false"
>
<div *ngIf="dob.errors && dob.errors.required">DOB is required</div>
</div>
</div>
<div class="row">
<h6>
<input
class="styled-checkbox"
id="styled-checkbox-1"
type="checkbox"
value="true"
[(ngModel)]="signup.terms"
required
name="terms"
#terms="ngModel"
/>
<label for="styled-checkbox-1"
><span
>I agree with
<a (click)="menuToggle()">Terms and Conditions</a></span
></label
>
</h6>
<div
class="md-errors-spacer"
[hidden]="terms.valid || submitted == false"
>
<div *ngIf="terms.errors && terms.errors.required">
Please accept Terms and Conditions
</div>
</div>
</div>
<div class="row">
<button class="login_btn" (click)="onSignup(signupForm)">
SIGN UP
</button>
</div>
</form>
<div class="row">
<hr />
<p><span>OR</span></p>
</div>
<div class="row">
<div class="social_div">
<div
class="social_btn"
style="border-right:1px solid rgba(215, 213, 228, 1);"
(click)="register.facebook()"
>
Facebook
</div>
<div class="social_btn" (click)="register.google(2)">
Google
</div>
</div>
</div>
</div>
</div>
</ion-content>
<div class="terms_wrapper" *ngIf="menuShow" [@slideInOut]>
<div class="terms_inner">
<h5>Terms & Conditions</h5>
<p>
Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has
survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop
publishing software like Aldus PageMaker including versions of Lorem Ipsum.
</p>
<button class="accept" (click)="menuToggle()">I Accept</button>
</div>
</div>
\ No newline at end of file
<div class="terms_inner">
<h5>Terms & Conditions</h5>
<p>
Lorem Ipsum is simply dummy text of the printing and typesetting industry.
Lorem Ipsum has been the industry's standard dummy text ever since the
1500s, when an unknown printer took a galley of type and scrambled it to
make a type specimen book. It has survived not only five centuries, but
also the leap into electronic typesetting, remaining essentially
unchanged. It was popularised in the 1960s with the release of Letraset
sheets containing Lorem Ipsum passages, and more recently with desktop
publishing software like Aldus PageMaker including versions of Lorem
Ipsum.
</p>
<button class="accept" (click)="menuToggle()">I Accept</button>
</div>
</div>
src/config/address.service.ts
import { Injectable } from '@angular/core';
import { AngularFirestore, AngularFirestoreCollection } from '@angular/fire/firestore';
import { AddressList, Address } from './services/address';
import { database } from 'firebase';
import { take } from 'rxjs/operators';
import { Injectable } from "@angular/core";
import {
AngularFirestore,
AngularFirestoreCollection
} from "@angular/fire/firestore";
import { AddressList, Address } from "./services/address";
import { database } from "firebase";
import { take } from "rxjs/operators";
@Injectable({
providedIn: 'root'
providedIn: "root"
})
export class AddressService {
addressList: AddressList[] = [];
constructor(
public afs: AngularFirestore
) {
}
constructor(public afs: AngularFirestore) {}
public async addList(userId: string) {
const This = this;
const state = true;
const orderRef: AngularFirestoreCollection<any> = this.afs.collection('address', ref => ref.where('status', '==', state)
.where('uid', '==', userId));
orderRef.valueChanges().pipe(
const orderRef: AngularFirestoreCollection<any> = this.afs.collection(
"address",
ref => ref.where("status", "==", state).where("uid", "==", userId)
);
orderRef
.valueChanges()
.pipe(
take(1) // Here you can limit to only emit once, using the take operator
).subscribe((value) => {
this.addressList = [];
const res = value;
if (res.length > 0) {
res.forEach((item) => {
console.log(item);
const address: AddressList = {
address: item.address,
addressType: item.addressType,
latLng: item.latLng,
defaultVal: item.defaultVal,
building: item. building,
landmark: item.landmark,
addressId: item.addressId
};
this.addressList.push(address);
});
console.log(this.addressList);
} else {
// alert('No Orders Found');
}
});
)
.subscribe(value => {
this.addressList = [];
const res = value;
if (res.length > 0) {
res.forEach(item => {
// console.log(item);
const address: AddressList = {
address: item.address,
addressType: item.addressType,
latLng: item.latLng,
defaultVal: item.defaultVal,
building: item.building,
landmark: item.landmark,
addressId: item.addressId
};
this.addressList.push(address);
});
// console.log(this.addressList);
} else {
// alert('No Orders Found');
}
});
}
addressCreate(data: Address) {
this.afs.collection('address').add({}).then((docRef) => {
data.addressId = docRef.id;
this.afs.collection('address').doc(data.addressId).set(data).then(() => {
console.log('Address created Successfully');
this.afs
.collection("address")
.add({})
.then(docRef => {
data.addressId = docRef.id;
this.afs
.collection("address")
.doc(data.addressId)
.set(data)
.then(() => {
// console.log('Address created Successfully');
});
});
});
}
setDefaultAddress(addId: string, userId: string) {
this.afs.collection('address', ref => ref.where('uid', '==', userId)).get().forEach((item) => {
this.afs
.collection("address", ref => ref.where("uid", "==", userId))
.get()
.forEach(item => {
return item.docs.map(m => {
return this.afs.doc(`address/${m.id}`).update({defaultVal: 0});
return this.afs.doc(`address/${m.id}`).update({ defaultVal: 0 });
});
});
this.afs.collection('address').doc(addId).update({defaultVal: 1}).then(() => {
console.log('Address updated Successfully');
});
});
this.afs
.collection("address")
.doc(addId)
.update({ defaultVal: 1 })
.then(() => {
// console.log('Address updated Successfully');
});
}
}
src/config/cart.service.ts
import { Injectable } from '@angular/core';
import { AngularFirestore, AngularFirestoreDocument, AngularFirestoreCollection } from '@angular/fire/firestore';
import { Router, ActivatedRoute } from '@angular/router';
import { Products } from './services/product';
import { Cart, CartItem } from './services/cart';
import { ServiceService } from './service.service';
import * as firebase from 'firebase';
import { take } from 'rxjs/operators';
import { User } from './services/user';
import { from } from 'rxjs';
import { Injectable } from "@angular/core";
import {
AngularFirestore,
AngularFirestoreDocument,
AngularFirestoreCollection
} from "@angular/fire/firestore";
import { Router, ActivatedRoute } from "@angular/router";
import { Products } from "./services/product";
import { Cart, CartItem } from "./services/cart";
import { ServiceService } from "./service.service";
import * as firebase from "firebase";
import { take } from "rxjs/operators";
import { User } from "./services/user";
import { from } from "rxjs";
@Injectable({
providedIn: 'root'
providedIn: "root"
})
export class CartsService {
size: string;
......@@ -27,13 +31,13 @@ export class CartsService {
public router: Router,
public service: ServiceService
) {
this.custId = '';
this.custId = "";
this.carts = [];
const users = this.service.get('user').then(data => {
const users = this.service.get("user").then(data => {
if (data) {
data = JSON.parse(data);
this.custId = data.uid;
console.log(this.custId);
// console.log(this.custId);
}
});
}
......@@ -42,30 +46,30 @@ export class CartsService {
this.prodId = product.prodId;
const prodRef = firebase
.firestore()
.collection('products')
.collection("products")
.doc(this.prodId);
this.size = this.size === undefined ? product.size[0] : this.size;
this.color = this.color === undefined ? product.color[0] : this.color;
const cartRef: AngularFirestoreCollection<any> = this.afs.collection(
'carts',
"carts",
ref =>
ref
.where('size', '==', this.size)
.where('color', '==', this.color)
.where('custId', '==', this.custId)
.where('product', '==', prodRef)
.where("size", "==", this.size)
.where("color", "==", this.color)
.where("custId", "==", this.custId)
.where("product", "==", prodRef)
);
cartRef
.valueChanges()
.pipe(take(1))
.subscribe(value => {
console.log(value);
// console.log(value);
if (value.length === 0) {
product.image =
product.image === undefined
? '../assets/model1@3x.jpg'
? "../assets/model1@3x.jpg"
: product.image;
const cart: Cart = {
color: this.color,
......@@ -80,36 +84,36 @@ export class CartsService {
qty: 1,
size: this.size
};
console.log(cart);
// console.log(cart);
this.afs
.collection('carts')
.collection("carts")
.add(cart)
.then(docRef => {
const neworderId = docRef.id;
this.afs
.collection('carts')
.collection("carts")
.doc(neworderId)
.update({ cartId: docRef.id })
.then(() => {
console.log('Booking Successfully');
// console.log('Booking Successfully');
document.body.scrollTop = document.documentElement.scrollTop = 0;
});
})
.catch(error => {
console.error('Error adding document: ', error);
console.error("Error adding document: ", error);
});
} else {
console.log(value);
// console.log(value);
// alert('Item already added in the cart');
const cartId = value[0].cartId;
// tslint:disable-next-line:radix
const qty = parseInt(value[0].qty) + 1;
this.afs
.collection('carts')
.collection("carts")
.doc(cartId)
.update({ qty: `${qty}` })
.then(() => {
console.log('Booking Successfully');
// console.log('Booking Successfully');
document.body.scrollTop = document.documentElement.scrollTop = 0;
});
}
......@@ -118,8 +122,8 @@ export class CartsService {
public async cartList() {
const cartRef: AngularFirestoreCollection<any> = this.afs.collection(
'carts',
ref => ref.where('custId', '==', this.custId)
"carts",
ref => ref.where("custId", "==", this.custId)
);
cartRef.valueChanges().subscribe(value => {
this.carts = [];
......@@ -139,7 +143,7 @@ export class CartsService {
qty: item.qty,
size: item.size
};
console.log(item.price, item.qty);
// console.log(item.price, item.qty);
if (item.price) {
this.cartTotal += item.price * item.qty;
}
......@@ -175,9 +179,9 @@ export class CartsService {
? this.carts[index].qty - 1
: this.carts[index].qty;
this.carts[index].qty = qty;
console.log(this.carts[index].qty);
// console.log(this.carts[index].qty);
this.afs
.collection('carts')
.collection("carts")
.doc(this.carts[index].cartId)
.update({
qty: this.carts[index].qty
......@@ -189,7 +193,7 @@ export class CartsService {
this.cartTotal = 0;
this.carts[index].qty = qty;
this.afs
.collection('carts')
.collection("carts")
.doc(this.carts[index].cartId)
.update({
qty: this.carts[index].qty
......@@ -198,21 +202,19 @@ export class CartsService {
removeItem(index) {
this.afs
.collection('carts')
.collection("carts")
.doc(this.carts[index].cartId)
.delete();
}
checkPromo(promoCode: string) {
console.log(promoCode);
// console.log(promoCode);
const state = true;
const promoRef: AngularFirestoreCollection<any> = this.afs.collection('promocode', ref => ref.where('promoCode', '==', promoCode)
.where('status', '==', state));
const promoRef: AngularFirestoreCollection<any> = this.afs.collection(
"promocode",
ref =>
ref.where("promoCode", "==", promoCode).where("status", "==", state)
);
return promoRef.valueChanges();
}
}
src/config/category.service.ts
import { Injectable } from '@angular/core';
import { AngularFirestore, AngularFirestoreDocument, AngularFirestoreCollection } from '@angular/fire/firestore';
import { Category } from './services/category';
import * as firebase from 'firebase';
import { ServiceService } from './service.service';
import { Injectable } from "@angular/core";
import {
AngularFirestore,
AngularFirestoreDocument,
AngularFirestoreCollection
} from "@angular/fire/firestore";
import { Category } from "./services/category";
import * as firebase from "firebase";
import { ServiceService } from "./service.service";
@Injectable({
providedIn: 'root'
providedIn: "root"
})
export class CategoriesService {
categories: Category[] = [];
activecategories: Category[] = [];
constructor(
public afs: AngularFirestore,
public service: ServiceService
) {
constructor(public afs: AngularFirestore, public service: ServiceService) {
this.categoryList();
this.activeCategory();
}
public async categoryList() {
const This = this;
const orderRef: AngularFirestoreCollection<any> = this.afs.collection('shopcategory');
orderRef.valueChanges().subscribe((value) => {
const orderRef: AngularFirestoreCollection<any> = this.afs.collection(
"shopcategory"
);
orderRef.valueChanges().subscribe(value => {
this.categories = [];
const res = value;
if (res.length > 0) {
res.forEach((item) => {
console.log(item);
res.forEach(item => {
// console.log(item);
const category: Category = {
catId: item.catId,
catName: item.catName,
......@@ -36,7 +39,7 @@ export class CategoriesService {
};
this.categories.push(category);
});
console.log(this.categories);
// console.log(this.categories);
} else {
// alert('No Orders Found');
}
......@@ -46,13 +49,16 @@ export class CategoriesService {
public async activeCategory() {
const This = this;
const state = true;
const orderRef: AngularFirestoreCollection<any> = this.afs.collection('shopcategory', ref => ref.where('status', '==', state));
orderRef.valueChanges().subscribe((value) => {
const orderRef: AngularFirestoreCollection<any> = this.afs.collection(
"shopcategory",
ref => ref.where("status", "==", state)
);
orderRef.valueChanges().subscribe(value => {
this.activecategories = [];
const res = value;
if (res.length > 0) {
res.forEach((item) => {
console.log(item);
res.forEach(item => {
// console.log(item);
const category: Category = {
catId: item.catId,
catName: item.catName,
......@@ -62,7 +68,7 @@ export class CategoriesService {
};
this.activecategories.push(category);
});
console.log(this.activecategories);
// console.log(this.activecategories);
} else {
// alert('No Orders Found');
}
......
src/config/center.service.ts
import { Injectable } from '@angular/core';
import { AngularFirestore, AngularFirestoreDocument, AngularFirestoreCollection } from '@angular/fire/firestore';
import { Centers, CenterData } from './services/center';
import * as firebase from 'firebase';
import { Injectable } from "@angular/core";
import {
AngularFirestore,
AngularFirestoreDocument,
AngularFirestoreCollection
} from "@angular/fire/firestore";
import { Centers, CenterData } from "./services/center";
import * as firebase from "firebase";
@Injectable({
providedIn: 'root'
providedIn: "root"
})
export class CenterService {
centers: Centers[] = [];
nearcenters: Centers[] = [];
constructor(
public afs: AngularFirestore
) {
constructor(public afs: AngularFirestore) {
this.centerList();
this.getNearBy(10.0159, 76.3419, 10);
}
......@@ -19,14 +21,16 @@ export class CenterService {
public async centerList() {
const This = this;
const state = true;
const orderRef: AngularFirestoreCollection<any> = this.afs.collection('centers', ref => ref.where('featured', '==', state)
.where('status', '==', state));
orderRef.valueChanges().subscribe((value) => {
const orderRef: AngularFirestoreCollection<any> = this.afs.collection(
"centers",
ref => ref.where("featured", "==", state).where("status", "==", state)
);
orderRef.valueChanges().subscribe(value => {
this.centers = [];
const res = value;
if (res.length > 0) {
res.forEach((item) => {
console.log(item);
res.forEach(item => {
// console.log(item);
if (item.centerName === undefined) {
return;
}
......@@ -42,7 +46,7 @@ export class CenterService {
};
this.centers.push(center);
});
console.log(this.centers);
// console.log(this.centers);
} else {
// alert('No Orders Found');
}
......@@ -56,22 +60,31 @@ export class CenterService {
const lat = 0.0144927536231884;
const lon = 0.0181818181818182;
const lowerLat = latitude - (lat * distance);
const lowerLon = longitude - (lon * distance);
const lowerLat = latitude - lat * distance;
const lowerLon = longitude - lon * distance;
const greaterLat = latitude + (lat * distance);
const greaterLon = longitude + (lon * distance);
const greaterLat = latitude + lat * distance;
const greaterLon = longitude + lon * distance;
const lesserGeopoint = new firebase.firestore.GeoPoint(lowerLat, lowerLon);
const greaterGeopoint = new firebase.firestore.GeoPoint(greaterLat, greaterLon);
const orderRef: AngularFirestoreCollection<any> = this.afs.collection('centers', ref => ref.where('latLng', '>', lesserGeopoint)
.where('latLng', '<', greaterGeopoint).where('status', '==', state));
orderRef.valueChanges().subscribe((value) => {
const greaterGeopoint = new firebase.firestore.GeoPoint(
greaterLat,
greaterLon
);
const orderRef: AngularFirestoreCollection<any> = this.afs.collection(
"centers",
ref =>
ref
.where("latLng", ">", lesserGeopoint)
.where("latLng", "<", greaterGeopoint)
.where("status", "==", state)
);
orderRef.valueChanges().subscribe(value => {
this.nearcenters = [];
const res = value;
if (res.length > 0) {
res.forEach((item) => {
console.log(item);
res.forEach(item => {
// console.log(item);
if (item.centerName === undefined) {
return;
}
......@@ -87,11 +100,10 @@ export class CenterService {
};
this.nearcenters.push(center);
});
console.log(this.nearcenters);
// console.log(this.nearcenters);
} else {
// alert('No Orders Found');
}
});
}
}
src/config/myorder.service.ts
import { Injectable } from '@angular/core';
import { AngularFirestore, AngularFirestoreDocument, AngularFirestoreCollection } from '@angular/fire/firestore';
import { Myorder } from './services/myorder';
import { ServiceService } from './../config/service.service';
import * as firebase from 'firebase';
import { take } from 'rxjs/operators';
import { Observable, of } from 'rxjs';
import { Injectable } from "@angular/core";
import {
AngularFirestore,
AngularFirestoreDocument,
AngularFirestoreCollection
} from "@angular/fire/firestore";
import { Myorder } from "./services/myorder";
import { ServiceService } from "./../config/service.service";
import * as firebase from "firebase";
import { take } from "rxjs/operators";
import { Observable, of } from "rxjs";
@Injectable({
providedIn: 'root'
providedIn: "root"
})
export class MyordersService {
product: Myorder[] = [];
......@@ -15,11 +19,8 @@ export class MyordersService {
orders: Myorder[];
selItem: Myorder;
constructor(
public afs: AngularFirestore,
public service: ServiceService
) {
const users = this.service.get('user').then((data) => {
constructor(public afs: AngularFirestore, public service: ServiceService) {
const users = this.service.get("user").then(data => {
if (data) {
data = JSON.parse(data);
this.custId = data.uid;
......@@ -28,28 +29,28 @@ export class MyordersService {
// this.orderState();
}
} else {
this.custId = 'WwHnLICVY2dvZGUHuKqasiTB91a2';
this.custId = "WwHnLICVY2dvZGUHuKqasiTB91a2";
}
});
}
/*public async orgorderList(custId) {
console.log('called');
console.log(custId);
// console.log('called');
// console.log(custId);
const This = this;
const orderRef: AngularFirestoreCollection<any> = this.afs.collection('orders', ref => ref.where('custId', '==', custId)
.orderBy('bookDate', 'desc'));
orderRef.stateChanges().subscribe((value) => {
console.log(value[0].payload.doc.data());
// console.log(value[0].payload.doc.data());
});
orderRef.valueChanges().pipe(take(1)).subscribe((value) => {
console.log(value);
// console.log(value);
this.orders = [];
const res = value;
if (res.length > 0) {
res.forEach((item) => {
console.log(item);
// console.log(item);
const order: Myorder = {
prodName: item.prodName,
color: item.color,
......@@ -70,7 +71,7 @@ export class MyordersService {
};
this.orders.push(order);
});
console.log(this.orders);
// console.log(this.orders);
} else {
alert('No Orders Found');
}
......@@ -78,22 +79,23 @@ export class MyordersService {
});
}*/
public async orderList(custId) {
console.log('called');
console.log(custId);
// console.log('called');
// console.log(custId);
const This = this;
this.orders = [];
const orderRef: AngularFirestoreCollection<any> = this.afs.collection('orders', ref => ref.where('custId', '==', custId)
.orderBy('bookDate', 'desc'));
orderRef.stateChanges().subscribe((value) => {
console.log(value);
const orderRef: AngularFirestoreCollection<any> = this.afs.collection(
"orders",
ref => ref.where("custId", "==", custId).orderBy("bookDate", "desc")
);
orderRef.stateChanges().subscribe(value => {
// console.log(value);
const res = value;
console.log(res);
// console.log(res);
if (res.length > 0) {
res.forEach((items) => {
res.forEach(items => {
const item = items.payload.doc.data();
console.log(item);
// console.log(item);
const orderId = item.orderId;
const order: Myorder = {
amount: item.amount,
......@@ -103,40 +105,39 @@ export class MyordersService {
deliveryLocation: item.deliveryLocation,
pickupLocation: item.pickupLocation,
deliveryAddress: item.deliveryAddress,
riderName: 'John',
riderName: "John",
orderId: item.orderId,
orderCode: item.orderCode,
product: this.service.key2Array(item.product),
time: '60'
time: "60"
};
console.log(order);
if (items.type === 'added') {
// console.log(order);
if (items.type === "added") {
this.orders.push(order);
} else {
console.log(orderId);
// console.log(orderId);
const index = this.orders.findIndex(obj => obj.orderId === orderId);
if (index >= 0) {
this.orders[index] = order;
}
}
});
console.log(this.orders);
}
// console.log(this.orders);
}
});
}
/* public orderState(): Observable<Myorder[]> {
console.log('called');
/* public orderState(): Observable<Myorder[]> {
// console.log('called');
const custId = 'WwHnLICVY2dvZGUHuKqasiTB91a2';
this.orders = [];
firebase.firestore().collection('orders').where('custId', '==', custId)
.onSnapshot((snapData) => {
snapData.docChanges().forEach((change) => {
console.log(change.type);
// console.log(change.type);
if (change.type === 'modified') {
const item = change.doc.data();
console.log(item);
// console.log(item);
const orderId = item.orderId;
const order: Myorder = {
prodName: item.prodName,
......@@ -157,9 +158,9 @@ export class MyordersService {
const count = this.orders.length;
for (let index = 0; index < count; index++) {
if (this.orders[index].orderId === orderId) {
console.log(index);
// console.log(index);
this.orders[index] = order;
console.log(this.orders);
// console.log(this.orders);
break;
}
}
......@@ -195,13 +196,13 @@ export class MyordersService {
.onSnapshot(function(snapshot) {
snapshot.docChanges().forEach(function(change) {
if (change.type === "added") {
console.log("New city: ", change.doc.data());
// console.log("New city: ", change.doc.data());
}
if (change.type === "modified") {
console.log("Modified city: ", change.doc.data());
// console.log("Modified city: ", change.doc.data());
}
if (change.type === "removed") {
console.log("Removed city: ", change.doc.data());
// console.log("Removed city: ", change.doc.data());
}
});
});
......@@ -209,7 +210,6 @@ export class MyordersService {
}
*/
public async trackOrder(order) {
this.selItem = order;
this.selItem = order;
}
}
src/config/order.service.ts
import { Injectable } from '@angular/core';
import { AngularFirestore, AngularFirestoreDocument, AngularFirestoreCollection } from '@angular/fire/firestore';
import { Router, ActivatedRoute } from '@angular/router';
import { Order, CartProd } from './services/order';
import { Products } from './services/product';
import { ServiceService } from './service.service';
import * as firebase from 'firebase';
import { CartItem } from './services/cart';
import { BehaviorSubject } from 'rxjs';
import { Injectable } from "@angular/core";
import {
AngularFirestore,
AngularFirestoreDocument,
AngularFirestoreCollection
} from "@angular/fire/firestore";
import { Router, ActivatedRoute } from "@angular/router";
import { Order, CartProd } from "./services/order";
import { Products } from "./services/product";
import { ServiceService } from "./service.service";
import * as firebase from "firebase";
import { CartItem } from "./services/cart";
import { BehaviorSubject } from "rxjs";
@Injectable({
providedIn: 'root'
providedIn: "root"
})
export class OrdersService {
order: Order;
......@@ -26,24 +29,24 @@ export class OrdersService {
public router: Router,
public service: ServiceService
) {
this.size = 'small';
this.color = 'Blue';
this.custId = '';
this.service.get('user').then((data) => {
this.size = "small";
this.color = "Blue";
this.custId = "";
this.service.get("user").then(data => {
if (data) {
data = JSON.parse(data);
this.users = data;
this.custId = data.uid;
console.log(this.custId);
// console.log(this.custId);
} else {
this.custId = 'WwHnLICVY2dvZGUHuKqasiTB91a2';
this.custId = "WwHnLICVY2dvZGUHuKqasiTB91a2";
}
});
}
/*public async orgcheckOut(cart: CartItem[]) {
console.log(cart);
console.log(this.users);
// console.log(cart);
// console.log(this.users);
return;
let currProcess = 0;
const cartCount = cart.length;
......@@ -86,10 +89,10 @@ export class OrdersService {
};
this.afs.collection('orders').doc(neworderId).set(orderItem).then(() => {
currProcess += 1;
console.log('Booking Successfully');
// console.log('Booking Successfully');
this.afs.doc(`carts/${product.cartId}`).delete();
// this.router.navigateByUrl('cart');
console.log(currProcess, cartCount);
// console.log(currProcess, cartCount);
document.body.scrollTop = document.documentElement.scrollTop = 0;
if (currProcess === cartCount) {
// this.router.navigateByUrl('cart');
......@@ -103,107 +106,119 @@ export class OrdersService {
}*/
public async checkOut(cart: CartItem[], otherCharge) {
console.log(cart);
console.log(this.users);
// console.log(cart);
// console.log(this.users);
const cartGroup = [];
// const distinctShops = [...new Set(cart.map(obj => obj.shopperId))];
const distinctShops = [];
const map = new Map();
for (const item of cart) {
if (!map.has(item.shopperId)) {
map.set(item.shopperId, true); // set any value to Map
distinctShops.push(item.shopperId);
}
if (!map.has(item.shopperId)) {
map.set(item.shopperId, true); // set any value to Map
distinctShops.push(item.shopperId);
}
}
cart.forEach((items) => {
cartGroup[items.shopperId] = cartGroup[items.shopperId] === undefined ? [] : cartGroup[items.shopperId];
cart.forEach(items => {
cartGroup[items.shopperId] =
cartGroup[items.shopperId] === undefined
? []
: cartGroup[items.shopperId];
cartGroup[items.shopperId].push(items);
});
const cartCount = distinctShops.length;
console.log(cartGroup);
console.log(cartCount);
// console.log(cartGroup);
// console.log(cartCount);
const promise = new Promise(resolve => {
distinctShops.forEach((item) => {
console.log(item);
this.afs.collection('orders').add({
bookDate: firebase.firestore.FieldValue.serverTimestamp()
}).then((docRef) => {
const neworderId = docRef.id;
const delivery = new firebase.firestore.GeoPoint(10.0237, 76.3116);
const pickup = new firebase.firestore.GeoPoint(10.7231, 76.1234);
const products = {};
const cartItem = cartGroup[item];
let prodPrice = 0;
cartItem.forEach((prodItem) => {
prodPrice += prodItem.price;
products[prodItem.prodId] = {
prodId: prodItem.prodId,
prodName: prodItem.prodName,
image: prodItem.image,
price: prodItem.price,
color: prodItem.color,
size: prodItem.size,
qty: prodItem.qty,
discount: ''
};
this.afs.doc(`carts/${prodItem.cartId}`).delete();
});
console.log(cartItem);
console.log(products);
const product = cartItem[0];
const orderItem: Order = {
amount: 'A$ ' + otherCharge.totalAmt,
customer: firebase.firestore().doc('/customer/' + this.custId),
shopper: product.shopper,
deliveryAddress: otherCharge.custAddress,
deliveryCharge: 'A$ ' + otherCharge.deliveryCharge,
deliveryLocation: delivery,
bookDate: firebase.firestore.FieldValue.serverTimestamp(),
orderCode: this.orderCode(),
orderId: neworderId,
orderStatus: 1,
pickupAddress: 'GetMi, Canberra, AUS',
pickupLocation: pickup,
promoId: null,
rider: firebase.firestore().doc('/riders/qbTKza18mWVzYG9NLIbmjMbrYjG2'),
status: 1,
custId: this.custId,
riderId: 'qbTKza18mWVzYG9NLIbmjMbrYjG2',
shopperId: product.shopperId,
custName: 'Jone Doe',
riderName: 'John',
shopperState: 0,
shopperName: 'Witchery',
product: products,
discount: 'A$ ' + otherCharge.discount,
promoApplied: otherCharge.discountApplied,
tax: 'A$ ' + otherCharge.taxAmount
};
console.log(orderItem);
this.afs.collection('orders').doc(neworderId).set(orderItem).then(() => {
console.log('Booking Successfully');
// this.router.navigateByUrl('cart');
resolve('Cart to Order Successfully');
document.body.scrollTop = document.documentElement.scrollTop = 0;
});
}).catch((error) => {
console.error('Error adding document: ', error);
distinctShops.forEach(item => {
// console.log(item);
this.afs
.collection("orders")
.add({
bookDate: firebase.firestore.FieldValue.serverTimestamp()
})
.then(docRef => {
const neworderId = docRef.id;
const delivery = new firebase.firestore.GeoPoint(10.0237, 76.3116);
const pickup = new firebase.firestore.GeoPoint(10.7231, 76.1234);
const products = {};
const cartItem = cartGroup[item];
let prodPrice = 0;
cartItem.forEach(prodItem => {
prodPrice += prodItem.price;
products[prodItem.prodId] = {
prodId: prodItem.prodId,
prodName: prodItem.prodName,
image: prodItem.image,
price: prodItem.price,
color: prodItem.color,
size: prodItem.size,
qty: prodItem.qty,
discount: ""
};
this.afs.doc(`carts/${prodItem.cartId}`).delete();
});
// console.log(cartItem);
// console.log(products);
const product = cartItem[0];
const orderItem: Order = {
amount: "A$ " + otherCharge.totalAmt,
customer: firebase.firestore().doc("/customer/" + this.custId),
shopper: product.shopper,
deliveryAddress: otherCharge.custAddress,
deliveryCharge: "A$ " + otherCharge.deliveryCharge,
deliveryLocation: delivery,
bookDate: firebase.firestore.FieldValue.serverTimestamp(),
orderCode: this.orderCode(),
orderId: neworderId,
orderStatus: 1,
pickupAddress: "GetMi, Canberra, AUS",
pickupLocation: pickup,
promoId: null,
rider: firebase
.firestore()
.doc("/riders/qbTKza18mWVzYG9NLIbmjMbrYjG2"),
status: 1,
custId: this.custId,
riderId: "qbTKza18mWVzYG9NLIbmjMbrYjG2",
shopperId: product.shopperId,
custName: "Jone Doe",
riderName: "John",
shopperState: 0,
shopperName: "Witchery",
product: products,
discount: "A$ " + otherCharge.discount,
promoApplied: otherCharge.discountApplied,
tax: "A$ " + otherCharge.taxAmount
};
// console.log(orderItem);
this.afs
.collection("orders")
.doc(neworderId)
.set(orderItem)
.then(() => {
// console.log('Booking Successfully');
// this.router.navigateByUrl('cart');
resolve("Cart to Order Successfully");
document.body.scrollTop = document.documentElement.scrollTop = 0;
});
})
.catch(error => {
console.error("Error adding document: ", error);
});
});
});
});
promise.then(value => console.log(value));
// promise.then(value => console.log(value));
}
public async changeOrder(orderId, status) {
console.log(orderId, status);
this.afs.collection('orders').doc(orderId).update({orderStatus: status});
// console.log(orderId, status);
this.afs
.collection("orders")
.doc(orderId)
.update({ orderStatus: status });
}
public async buyNow(product: Products) {
......@@ -211,19 +226,18 @@ export class OrdersService {
}
orderCode() {
const newpin = Math.round(Math.random() * 1000000);
const orderCode = 'GM' + this.pad(newpin, 6, null);
const newpin = Math.round(Math.random() * 1000000);
const orderCode = "GM" + this.pad(newpin, 6, null);
return orderCode;
}
pad(n, width, z) {
z = z || '0';
n = n + '';
z = z || "0";
n = n + "";
return n.length >= width ? n : new Array(width - n.length + 1).join(z) + n;
}
choose_size(size: string) {
this.size = size;
}
}
src/config/products.service.ts
import { Injectable } from '@angular/core';
import { AngularFirestore, AngularFirestoreDocument, AngularFirestoreCollection } from '@angular/fire/firestore';
import { Products } from './services/product';
import { ServiceService } from './../config/service.service';
import { take } from 'rxjs/operators';
import { Injectable } from "@angular/core";
import {
AngularFirestore,
AngularFirestoreDocument,
AngularFirestoreCollection
} from "@angular/fire/firestore";
import { Products } from "./services/product";
import { Slides } from "./services/slides";
import { ServiceService } from "./../config/service.service";
import { take } from "rxjs/operators";
@Injectable({
providedIn: 'root'
providedIn: "root"
})
export class ProductsService {
prodSlideImg: Slides[] = [];
product: Products[] = [];
fav: any[];
selItem: Products;
similar: Products[] = [];
user: any;
constructor(
public afs: AngularFirestore,
public service: ServiceService
) {
constructor(public afs: AngularFirestore, public service: ServiceService) {
this.product = [];
this.fav = [];
this.service.get('user').then(data => {
this.prodSlideImg = [];
this.service.get("user").then(data => {
this.user = JSON.parse(data);
this.getFavlist(this.user.uid);
});
}
// Fetches images for slide
public async getProdSlide(skuID: string) {
const This = this;
const state = true;
// firebase query
const prodRef: AngularFirestoreCollection<any> = this.afs.collection(
`product_gallery`,
ref => ref.where("skuId", "==", skuID)
);
prodRef.valueChanges().subscribe(value => {
this.prodSlideImg = [];
const res = value;
if (res.length > 0) {
res.forEach(item => {
const slideImg: Slides = {
downloadURL: item.downloadURL,
imageId: item.imageId,
path: item.path,
skuId: item.skuId
};
this.prodSlideImg.push(slideImg);
});
console.log("[prodSlideImgArray]", this.prodSlideImg);
return this.prodSlideImg;
} else {
// alert("No Products Found");
}
});
}
public async prodList(shopperId: string) {
const This = this;
const state = true;
console.log(shopperId);
const prodRef: AngularFirestoreCollection<any> = this.afs.collection(`products`, ref => ref.where('shopperId', '==', shopperId)
.where('status', '==', state));
prodRef.valueChanges().subscribe((value) => {
// console.log(shopperId);
const prodRef: AngularFirestoreCollection<any> = this.afs.collection(
`products`,
ref =>
ref.where("shopperId", "==", shopperId).where("status", "==", state)
);
prodRef.valueChanges().subscribe(value => {
this.product = [];
const res = value;
if (res.length > 0) {
res.forEach((item) => {
console.log(item.size);
res.forEach(item => {
// console.log(item.size);
const prod: Products = {
prodId: item.prodId,
prodName: item.prodName,
......@@ -61,7 +102,7 @@ export class ProductsService {
};
this.product.push(prod);
});
console.log(this.product);
// console.log(this.product);
} else {
// alert('No Products Found');
}
......@@ -71,34 +112,35 @@ export class ProductsService {
public async filterSearch(sortValue: string) {
const This = this;
const state = true;
console.log(sortValue);
// console.log(sortValue);
let field, order;
if (sortValue === 'low') {
field = 'price';
order = 'asc';
if (sortValue === "low") {
field = "price";
order = "asc";
}
if (sortValue === 'high') {
field = 'price';
order = 'desc';
if (sortValue === "high") {
field = "price";
order = "desc";
}
if (sortValue === 'rate') {
if (sortValue === "rate") {
// field = 'price';
// order = 'desc';
}
// tslint:disable-next-line:max-line-length
const prodRef: AngularFirestoreCollection<any> = this.afs.collection(`products`, ref => ref.where('status', '==', state).orderBy(field, order));
prodRef.valueChanges().subscribe((value) => {
const prodRef: AngularFirestoreCollection<any> = this.afs.collection(
`products`,
ref => ref.where("status", "==", state).orderBy(field, order)
);
prodRef.valueChanges().subscribe(value => {
this.product = [];
const res = value;
if (res.length > 0) {
res.forEach((item) => {
console.log(item.size);
res.forEach(item => {
// console.log(item.size);
const prod: Products = {
prodId: item.prodId,
prodName: item.prodName,
......@@ -123,29 +165,34 @@ export class ProductsService {
};
this.product.push(prod);
});
console.log(this.product);
// console.log(this.product);
} else {
// alert('No Products Found');
}
});
}
similarProd(shopperId, category, subCate, prodId) {
const This = this;
const state = true;
console.log(shopperId);
const prodRef: AngularFirestoreCollection<any> = this.afs.collection(`products`, ref => ref.where('shopperId', '==', shopperId)
.where('status', '==', state).where('category', '==', category).where('subCate', '==', subCate).where('prodId', '>', prodId)
.where('prodId', '<', prodId));
prodRef.valueChanges().subscribe((value) => {
// console.log(shopperId);
const prodRef: AngularFirestoreCollection<any> = this.afs.collection(
`products`,
ref =>
ref
.where("shopperId", "==", shopperId)
.where("status", "==", state)
.where("category", "==", category)
.where("subCate", "==", subCate)
.where("prodId", ">", prodId)
.where("prodId", "<", prodId)
);
prodRef.valueChanges().subscribe(value => {
this.similar = [];
const res = value;
if (res.length > 0) {
res.forEach((item) => {
console.log(item.size);
res.forEach(item => {
// console.log(item.size);
const prod: Products = {
prodId: item.prodId,
prodName: item.prodName,
......@@ -170,65 +217,89 @@ export class ProductsService {
};
this.similar.push(prod);
});
console.log(this.similar);
// console.log(this.similar);
} else {
// alert('No Products Found');
}
});
}
public async setProd(item: Products) {
this.selItem = item;
}
public async getFavlist(userId: string) {
const favRef: AngularFirestoreDocument<any> = this.afs.collection(`favourite`).doc(userId);
favRef.valueChanges().pipe(
take(1) // Here you can limit to only emit once, using the take operator
).subscribe((value) => {
if (value !== undefined) {
if (Object.keys(value).length > 0) {
this.fav = this.service.splitSep(value);
console.log(this.fav);
const favRef: AngularFirestoreDocument<any> = this.afs
.collection(`favourite`)
.doc(userId);
favRef
.valueChanges()
.pipe(
take(1) // Here you can limit to only emit once, using the take operator
)
.subscribe(value => {
if (value !== undefined) {
if (Object.keys(value).length > 0) {
this.fav = this.service.splitSep(value);
// console.log(this.fav);
}
// console.log(value);
}
console.log(value);
}
});
});
}
public async changeFav(index, type) {
console.log(index, type, this.user.uid);
if (type === 'no') {
this.afs.collection('favourite').doc(this.user.uid).valueChanges().pipe(
take(1) // Here you can limit to only emit once, using the take operator
).subscribe((value) => {
if (value === undefined) {
this.afs.collection('favourite').doc(this.user.uid).set({
[index]: true
});
} else {
console.log(value);
value[index] = true;
console.log(value);
this.afs.collection('favourite').doc(this.user.uid).set(value);
}
});
// console.log(index, type, this.user.uid);
if (type === "no") {
this.afs
.collection("favourite")
.doc(this.user.uid)
.valueChanges()
.pipe(
take(1) // Here you can limit to only emit once, using the take operator
)
.subscribe(value => {
if (value === undefined) {
this.afs
.collection("favourite")
.doc(this.user.uid)
.set({
[index]: true
});
} else {
// console.log(value);
value[index] = true;
// console.log(value);
this.afs
.collection("favourite")
.doc(this.user.uid)
.set(value);
}
});
} else {
this.afs.collection('favourite').doc(this.user.uid).valueChanges().pipe(
take(1) // Here you can limit to only emit once, using the take operator
).subscribe((value) => {
console.log(value);
if (value !== undefined) {
value[index] = undefined;
Object.keys(value).forEach(key => value[key] === undefined ? delete value[key] : '');
console.log(value);
this.afs.collection('favourite').doc(this.user.uid).set(value);
} else {
console.log(value);
}
});
this.afs
.collection("favourite")
.doc(this.user.uid)
.valueChanges()
.pipe(
take(1) // Here you can limit to only emit once, using the take operator
)
.subscribe(value => {
// console.log(value);
if (value !== undefined) {
value[index] = undefined;
Object.keys(value).forEach(key =>
value[key] === undefined ? delete value[key] : ""
);
// console.log(value);
this.afs
.collection("favourite")
.doc(this.user.uid)
.set(value);
} else {
// console.log(value);
}
});
}
}
}
src/config/search.service.ts
import { Injectable } from '@angular/core';
import { AngularFirestore, AngularFirestoreCollection } from '@angular/fire/firestore';
import {
AngularFirestore,
AngularFirestoreCollection
} from '@angular/fire/firestore';
import { Search } from './services/search';
import { database } from 'firebase';
import { take } from 'rxjs/operators';
......@@ -9,26 +12,32 @@ import { take } from 'rxjs/operators';
})
export class SearchService {
searchList: Search[] = [];
constructor(
public afs: AngularFirestore
) {
}
constructor(public afs: AngularFirestore) {}
public async search(inputText: string) {
if (inputText === '') {
this.searchList = [];
return;
this.searchList = [];
return;
}
const This = this;
const state = true;
this.searchList = [];
// tslint:disable-next-line:max-line-length
const orderRef: AngularFirestoreCollection<any> = this.afs.collection('shoppers', ref => ref.where('status', '==', state).orderBy('name').startAt(inputText).endAt(inputText + '\uf8ff').limit(5));
orderRef.valueChanges().subscribe((value) => {
const orderRef: AngularFirestoreCollection<any> = this.afs.collection(
'shoppers',
ref =>
ref
.where('status', '==', state)
.orderBy('name')
.startAt(inputText.toUpperCase())
.endAt(inputText.toLowerCase() + '\uf8ff')
.limit(5)
);
orderRef.valueChanges().subscribe(value => {
const res = value;
if (res.length > 0) {
res.forEach((item) => {
console.log(item);
res.forEach(item => {
// console.log(item);
const shopper: Search = {
text: item.name,
data: item,
......@@ -40,44 +49,57 @@ export class SearchService {
});
// tslint:disable-next-line:max-line-length
const prodRef: AngularFirestoreCollection<any> = this.afs.collection('products', ref => ref.where('status', '==', state).orderBy('prodName').startAt(inputText).endAt(inputText + '\uf8ff').limit(5));
prodRef.valueChanges().subscribe((values) => {
const result = values;
if (result.length > 0) {
result.forEach((item) => {
console.log(item);
const prod: Search = {
text: item.prodName,
data: item,
type: 'product'
};
this.searchList.push(prod);
});
console.log(this.searchList);
}
const prodRef: AngularFirestoreCollection<any> = this.afs.collection(
'products',
ref =>
ref
.where('status', '==', state)
.orderBy('prodName')
.startAt(inputText.toUpperCase())
.endAt(inputText.toLowerCase() + '\uf8ff')
.limit(5)
);
prodRef.valueChanges().subscribe(values => {
const result = values;
if (result.length > 0) {
result.forEach(item => {
console.log(item);
const prod: Search = {
text: item.prodName,
data: item,
type: 'product'
};
this.searchList.push(prod);
});
console.log(this.searchList);
}
});
// tslint:disable-next-line:max-line-length
const feaRef: AngularFirestoreCollection<any> = this.afs.collection('category', ref => ref.where('status', '==', state).orderBy('catName').startAt(inputText).endAt(inputText + '\uf8ff').limit(5));
feaRef.valueChanges().subscribe((values) => {
const result = values;
if (result.length > 0) {
result.forEach((item) => {
console.log(item);
const prod: Search = {
text: item.catName,
data: item,
type: 'category'
};
this.searchList.push(prod);
});
console.log(this.searchList);
}
const feaRef: AngularFirestoreCollection<any> = this.afs.collection(
'category',
ref =>
ref
.where('status', '==', state)
.orderBy('catName')
.startAt(inputText.toUpperCase())
.endAt(inputText.toLowerCase() + '\uf8ff')
.limit(5)
);
feaRef.valueChanges().subscribe(values => {
const result = values;
if (result.length > 0) {
result.forEach(item => {
console.log(item);
const prod: Search = {
text: item.catName,
data: item,
type: 'category'
};
this.searchList.push(prod);
});
console.log(this.searchList);
}
});
}
}
src/config/service.service.ts
import { Injectable } from '@angular/core';
import { Storage } from '@ionic/storage';
import { Injectable } from "@angular/core";
import { Storage } from "@ionic/storage";
@Injectable({
providedIn: 'root'
providedIn: "root"
})
export class ServiceService {
state: boolean;
constructor(public storage: Storage) {
......@@ -13,20 +12,20 @@ export class ServiceService {
}
public set(settingName: string, value: any) {
return this.storage.set(`setting:${ settingName }`, value);
return this.storage.set(`setting:${settingName}`, value);
}
public async get(settingName: string) {
return await this.storage.get(`setting:${ settingName }`);
return await this.storage.get(`setting:${settingName}`);
}
public async remove(settingName: string) {
return await this.storage.remove(`setting:${ settingName }`);
return await this.storage.remove(`setting:${settingName}`);
}
public clear() {
this.storage.clear().then(() => {
console.log('all keys cleared');
console.log("all keys cleared");
});
}
......@@ -34,7 +33,7 @@ export class ServiceService {
const response = [];
for (const key in item) {
if (item.hasOwnProperty(key)) {
response.push(item[key]);
response.push(item[key]);
}
}
return response;
......@@ -44,12 +43,9 @@ export class ServiceService {
const response = [];
for (const key in item) {
if (item.hasOwnProperty(key)) {
response.push(key);
response.push(key);
}
}
return response;
}
}
src/config/services/slides.ts 0 → 100644
export interface Slides {
downloadURL: string;
imageId: string;
path: string;
skuId: string;
}
src/config/services/user.ts
export interface User {
uid: string;
emailId: string;
name: string;
phone: string;
phoneVerified: boolean;
profilePhoto: string;
emailVerified: boolean;
status: boolean;
loginType: number;
otp: string;
currency: {
currId: string;
currName: string;
symbol: string
};
uid: string;
emailId: string;
name: string;
phone: string;
phoneVerified: boolean;
profilePhoto: string;
emailVerified: boolean;
status: boolean;
loginType: number;
otp: string;
currency: {
currId: string;
currName: string;
symbol: string;
};
}
export interface Signup {
name: string;
emailId: string;
phone: string;
password: string;
dob: any;
terms: boolean;
name: string;
emailId: string;
phone: string;
password: string;
dob: any;
terms: boolean;
}
// Model for Change Details page
export interface UpdateUserDetails {
name: string;
emailId: string;
phone: string;
}
// Model to Update Password
export interface UpdateUserDetails {}
export interface Otp {
uid: string;
otp: number;
uid: string;
otp: number;
}
export interface Address {
addressType: string;
firstAddress: string;
secondAddress: string;
city: string;
state: string;
district: string;
landmark: string;
area: string;
zip: string;
country: string;
default: number;
addressType: string;
firstAddress: string;
secondAddress: string;
city: string;
state: string;
district: string;
landmark: string;
area: string;
zip: string;
country: string;
default: number;
}
src/config/shopper.service.ts
import { Injectable } from '@angular/core';
import { AngularFireAuth } from '@angular/fire/auth';
import { AngularFirestore, AngularFirestoreDocument, AngularFirestoreCollection } from '@angular/fire/firestore';
import { Shopper } from './services/shopper';
import * as firebase from 'firebase';
import { Injectable } from "@angular/core";
import { AngularFireAuth } from "@angular/fire/auth";
import {
AngularFirestore,
AngularFirestoreDocument,
AngularFirestoreCollection
} from "@angular/fire/firestore";
import { Shopper } from "./services/shopper";
import * as firebase from "firebase";
@Injectable({
providedIn: 'root'
providedIn: "root"
})
export class ShoppersService {
shoppers: Shopper[] = [];
activeshoppers: Shopper[] = [];
nearshoppers: Shopper[] = [];
constructor(
public afs: AngularFirestore,
public afAuth: AngularFireAuth,
) {
constructor(public afs: AngularFirestore, public afAuth: AngularFireAuth) {
this.featuredshopperList();
this.getNearBy(10.0159, 76.3419, 10);
}
......@@ -22,14 +23,16 @@ export class ShoppersService {
public async shopperList(centerId: string, type: string) {
const This = this;
const state = true;
const orderRef: AngularFirestoreCollection<any> = this.afs.collection('shoppers', ref => ref.where(type, '==', centerId)
.where('status', '==', state));
orderRef.valueChanges().subscribe((value) => {
const orderRef: AngularFirestoreCollection<any> = this.afs.collection(
"shoppers",
ref => ref.where(type, "==", centerId).where("status", "==", state)
);
orderRef.valueChanges().subscribe(value => {
this.shoppers = [];
const res = value;
if (res.length > 0) {
res.forEach((item) => {
console.log(item);
res.forEach(item => {
// console.log(item);
const shopper: Shopper = {
name: item.name,
emailId: item.emailId,
......@@ -39,7 +42,7 @@ export class ShoppersService {
status: item.status,
address: item.address,
featured: item.featured,
featuredImage: item.featuredImage,
featuredImage: item.featuredImage,
shopName: item.shopName,
shopStatus: item.shopStatus,
workingHours: item.workingHours,
......@@ -49,7 +52,7 @@ export class ShoppersService {
};
this.shoppers.push(shopper);
});
console.log(this.shoppers);
// console.log(this.shoppers);
} else {
// alert('No Orders Found');
}
......@@ -59,14 +62,16 @@ export class ShoppersService {
public async featuredshopperList() {
const This = this;
const state = true;
const orderRef: AngularFirestoreCollection<any> = this.afs.collection('shoppers', ref => ref.where('featured', '==', state)
.where('status', '==', state));
orderRef.valueChanges().subscribe((value) => {
const orderRef: AngularFirestoreCollection<any> = this.afs.collection(
"shoppers",
ref => ref.where("featured", "==", state).where("status", "==", state)
);
orderRef.valueChanges().subscribe(value => {
this.activeshoppers = [];
const res = value;
if (res.length > 0) {
res.forEach((item) => {
console.log(item);
res.forEach(item => {
// console.log(item);
const shopper: Shopper = {
name: item.name,
emailId: item.emailId,
......@@ -76,7 +81,7 @@ export class ShoppersService {
status: item.status,
address: item.address,
featured: item.featured,
featuredImage: item.featuredImage,
featuredImage: item.featuredImage,
shopName: item.shopName,
shopStatus: item.shopStatus,
workingHours: item.workingHours,
......@@ -86,7 +91,7 @@ export class ShoppersService {
};
this.activeshoppers.push(shopper);
});
console.log(this.activeshoppers);
// console.log(this.activeshoppers);
} else {
// alert('No Orders Found');
}
......@@ -100,22 +105,31 @@ export class ShoppersService {
const lat = 0.0144927536231884;
const lon = 0.0181818181818182;
const lowerLat = latitude - (lat * distance);
const lowerLon = longitude - (lon * distance);
const lowerLat = latitude - lat * distance;
const lowerLon = longitude - lon * distance;
const greaterLat = latitude + (lat * distance);
const greaterLon = longitude + (lon * distance);
const greaterLat = latitude + lat * distance;
const greaterLon = longitude + lon * distance;
const lesserGeopoint = new firebase.firestore.GeoPoint(lowerLat, lowerLon);
const greaterGeopoint = new firebase.firestore.GeoPoint(greaterLat, greaterLon);
const orderRef: AngularFirestoreCollection<any> = this.afs.collection('shoppers', ref => ref.where('centre.latLng', '>', lesserGeopoint)
.where('centre.latLng', '<', greaterGeopoint).where('status', '==', state));
orderRef.valueChanges().subscribe((value) => {
const greaterGeopoint = new firebase.firestore.GeoPoint(
greaterLat,
greaterLon
);
const orderRef: AngularFirestoreCollection<any> = this.afs.collection(
"shoppers",
ref =>
ref
.where("centre.latLng", ">", lesserGeopoint)
.where("centre.latLng", "<", greaterGeopoint)
.where("status", "==", state)
);
orderRef.valueChanges().subscribe(value => {
this.nearshoppers = [];
const res = value;
if (res.length > 0) {
res.forEach((item) => {
console.log(item);
res.forEach(item => {
// console.log(item);
const shopper: Shopper = {
name: item.name,
emailId: item.emailId,
......@@ -125,7 +139,7 @@ export class ShoppersService {
status: item.status,
address: item.address,
featured: item.featured,
featuredImage: item.featuredImage,
featuredImage: item.featuredImage,
shopName: item.shopName,
shopStatus: item.shopStatus,
workingHours: item.workingHours,
......@@ -135,12 +149,10 @@ export class ShoppersService {
};
this.nearshoppers.push(shopper);
});
console.log(this.nearshoppers);
// console.log(this.nearshoppers);
} else {
// alert('No Orders Found');
}
});
}
}
src/config/update.service.ts 0 → 100644
import { Injectable } from "@angular/core";
import { User, UpdateUserDetails, Address } from "./services/user";
import { auth } from "firebase/app";
import { Router, ActivatedRoute } from "@angular/router";
import { AngularFireAuth } from "@angular/fire/auth";
import {
AngularFirestore,
AngularFirestoreDocument,
AngularFirestoreCollection
} from "@angular/fire/firestore";
import { ServiceService } from "./../config/service.service";
import { GooglePlus } from "@ionic-native/google-plus/ngx";
import { take } from "rxjs/operators";
import { from } from "rxjs";
@Injectable({
providedIn: "root"
})
export class UpdateService {
userData: any;
type: number;
userPostData: any;
updateStatus: number;
constructor(
public afs: AngularFirestore,
public afAuth: AngularFireAuth,
private router: Router,
private service: ServiceService
) {
// this.type = 1;
// this.afAuth.authState.subscribe(user => {
// if (user) {
// this.userData = user;
// console.log(this.userData);
// this.service.set("user", JSON.stringify(this.userData));
// if (this.type === 1) {
// this.router.navigateByUrl("home");
// } else {
// this.router.navigateByUrl("verification");
// }
// } else {
// this.service.set("user", null);
// JSON.parse(localStorage.getItem("user"));
// this.router.navigateByUrl("login");
// }
// });
}
updateData(userData: UpdateUserDetails, uid: string) {
this.type = 2;
const postData: UpdateUserDetails = {
phone: userData.phone,
name: userData.name,
emailId: userData.emailId
};
this.userPostData = postData;
this.afs
.collection("customers")
.doc(uid)
.update(postData)
.then(() => {
console.log("success");
this.router.navigateByUrl("profile");
})
.catch(error => {
console.log(error);
});
}
}
src/config/user.service.ts 0 → 100644
import { Injectable } from "@angular/core";
import { AngularFireAuth } from "@angular/fire/auth";
import {
AngularFirestore,
AngularFirestoreDocument,
AngularFirestoreCollection
} from "@angular/fire/firestore";
import * as firebase from "firebase";
import { User } from "./services/user";
@Injectable({
providedIn: "root"
})
// Gets User Details
export class UserService {
users: User;
constructor(public afs: AngularFirestore, public afAuth: AngularFireAuth) {}
public async getUserData(userId: string) {
const This = this;
const state = true;
// Get User Query
const userRef: AngularFirestoreCollection<any> = this.afs.collection(
"customers",
ref => ref.where("uid", "==", userId).where("status", "==", state)
);
userRef.valueChanges().subscribe(value => {
const res = value;
if (res.length > 0) {
const item = res[0];
this.users = {
name: item.name,
emailId: item.emailId,
phone: item.phone,
uid: item.uid,
profilePhoto: item.profilePic,
status: item.status,
phoneVerified: item.phoneVerified,
emailVerified: item.emailVerified,
loginType: 0,
otp: "",
currency: {
currId: "",
currName: "",
symbol: ""
}
};
}
// return this.users;
});
}
}
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