Merge branch 'arjunlatest' into 'master'

Arjunlatest See merge request !73

Merge branch 'arjunlatest' into 'master'
8281ba99 · Adarsh K · f9c1a3fe · 05adf738 · 8281ba99 · 8281ba99
Commit 8281ba99 authored Feb 19, 2020 by Adarsh K
23 changed files
--- a/package-lock.json
+++ b/package-lock.json
@@ -3553,9 +3553,9 @@
      "integrity": "sha512-QGThnPKzPxESHkruZlpE0+5aFBVOet8al0vIJ7laSUOQHIC1dd/JY6peVIbtLboKi5Dap1wCKRubOqPqH8xcQA=="
    },
    "cordova-plugin-googleplus": {
-      "version": "8.2.1",
+      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-googleplus/-/cordova-plugin-googleplus-8.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-googleplus/-/cordova-plugin-googleplus-8.4.0.tgz",
-      "integrity": "sha512-/SGTER2VJPCJ+sqGomYJbPr5/JM9EY74fqhfe1e47MurTfBs532uzbiLR47nDhhlRkCIzVy8GurZio9kcqcMJA==",
+      "integrity": "sha512-r8Zwtr2yQabzoFmhjSSC96VM94qMS7QkFjQjaJU2WSwTw8Xb6SBgwYUlJUvH0qTaasz3oOF8/B09W81OzWUTgg==",
      "requires": {
        "q": "*"
      }
@@ -3591,9 +3591,9 @@
      "integrity": "sha512-EYC5eQFVkoYXq39l7tYKE6lEjHJ04mvTmKXxGL7quHLdFPfJMNzru/UYpn92AOfpl3PQaZmou78C7EgmFOwFQQ=="
    },
    "cordova-plugin-x-socialsharing": {
-      "version": "5.6.3",
+      "version": "5.6.4",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-x-socialsharing/-/cordova-plugin-x-socialsharing-5.6.3.tgz",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-x-socialsharing/-/cordova-plugin-x-socialsharing-5.6.4.tgz",
-      "integrity": "sha512-veAoIOgviGL9RCUyol9e6BxBRpyPV5OWaAmFKglbLjF2uGvj73k+jPe2+2p39ySPetxC8KERAz+1I6tfjk42Zg=="
+      "integrity": "sha512-bBjWY9TgoH1CMK4P26zLT1D9rVcvI9LoIEGUjmwdLGiBP+IWo7RXu90RM1xHmVjG5hVLgmic5XyWc665ye8aRQ=="
    },
    "cordova-sqlite-storage": {
      "version": "3.4.1",
@@ -3811,7 +3811,8 @@
    "deep-equal": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
-      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU="
+      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
+      "dev": true
    },
    "default-gateway": {
      "version": "4.2.0",
@@ -4063,6 +4064,14 @@
      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
      "dev": true
    },
+    "dotignore": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/dotignore/-/dotignore-0.1.2.tgz",
+      "integrity": "sha512-UGGGWfSauusaVJC+8fgV+NVvBXkCTmVv7sk6nojDZZvuOUNGUy0Zk4UpHQD6EDjS0jpBwcACvH4eofvyzBcRDw==",
+      "requires": {
+        "minimatch": "^3.0.4"
+      }
+    },
    "duplexify": {
      "version": "3.7.1",
      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
@@ -4163,9 +4172,9 @@
      }
    },
    "endent": {
-      "version": "1.3.0",
+      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/endent/-/endent-1.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/endent/-/endent-1.4.0.tgz",
-      "integrity": "sha512-C8AryqPPwtydqcpO5AF6k9Bd1EpFkQtvsefJqS3y3n8TG13Jy63MascDxTOULZYqrUde+dK6BjNc6LIMr3iI2A==",
+      "integrity": "sha512-V9cYHc4IcnE9hYCuZat9YVUxIsK3gLB3gEUnr07rqElI+3TB+yC/wmMTNZ7L4xDmDFwg4Lypl5Gc3i+23komhA==",
      "requires": {
        "dedent": "^0.7.0",
        "fast-json-parse": "^1.0.3",
@@ -4319,6 +4328,7 @@
      "version": "1.13.0",
      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz",
      "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==",
+      "dev": true,
      "requires": {
        "es-to-primitive": "^1.2.0",
        "function-bind": "^1.1.1",
@@ -4332,6 +4342,7 @@
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
      "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
+      "dev": true,
      "requires": {
        "is-callable": "^1.1.4",
        "is-date-object": "^1.0.1",
@@ -6115,6 +6126,11 @@
        }
      }
    },
+    "is-arguments": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
+      "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA=="
+    },
    "is-arrayish": {
      "version": "0.2.1",
      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -6282,6 +6298,7 @@
      "version": "1.0.4",
      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+      "dev": true,
      "requires": {
        "has": "^1.0.1"
      }
@@ -8149,6 +8166,11 @@
      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
      "dev": true
    },
+    "mx.ferreyra.callnumber": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/mx.ferreyra.callnumber/-/mx.ferreyra.callnumber-0.0.2.tgz",
+      "integrity": "sha512-J9FJiMrfWG9Q8AQEz/cgYLcXTTD/Z5+vfq29hn8K7yVWjxkSzr7zFi7Dpn8wcv2iKHBHDJY+U0z8yoAzDugXMw=="
+    },
    "nan": {
      "version": "2.14.0",
      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
@@ -8470,9 +8492,14 @@
      }
    },
    "object-inspect": {
-      "version": "1.6.0",
+      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
-      "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ=="
+      "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="
+    },
+    "object-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.2.tgz",
+      "integrity": "sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ=="
    },
    "object-keys": {
      "version": "1.1.1",
@@ -8488,6 +8515,17 @@
        "isobject": "^3.0.0"
      }
    },
+    "object.assign": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "requires": {
+        "define-properties": "^1.1.2",
+        "function-bind": "^1.1.1",
+        "has-symbols": "^1.0.0",
+        "object-keys": "^1.0.11"
+      }
+    },
    "object.getownpropertydescriptors": {
      "version": "2.0.3",
      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
@@ -9580,6 +9618,63 @@
        "safe-regex": "^1.1.0"
      }
    },
+    "regexp.prototype.flags": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz",
+      "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.17.4",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
+          "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.1.5",
+            "is-regex": "^1.0.5",
+            "object-inspect": "^1.7.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.0",
+            "string.prototype.trimleft": "^2.1.1",
+            "string.prototype.trimright": "^2.1.1"
+          }
+        },
+        "es-to-primitive": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+          "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+          "requires": {
+            "is-callable": "^1.1.4",
+            "is-date-object": "^1.0.1",
+            "is-symbol": "^1.0.2"
+          }
+        },
+        "has-symbols": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+          "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
+        },
+        "is-callable": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
+          "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="
+        },
+        "is-regex": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
+          "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
+          "requires": {
+            "has": "^1.0.3"
+          }
+        }
+      }
+    },
    "regexpu-core": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz",
@@ -10824,13 +10919,79 @@
      "integrity": "sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg=="
    },
    "string.prototype.trim": {
-      "version": "1.1.2",
+      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.1.tgz",
-      "integrity": "sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo=",
+      "integrity": "sha512-MjGFEeqixw47dAMFMtgUro/I0+wNqZB5GKXGt1fFr24u3TzDXCPu7J9Buppzoe3r/LqkSDLDDJzE15RGWDGAVw==",
      "requires": {
-        "define-properties": "^1.1.2",
+        "define-properties": "^1.1.3",
-        "es-abstract": "^1.5.0",
+        "es-abstract": "^1.17.0-next.1",
-        "function-bind": "^1.0.2"
+        "function-bind": "^1.1.1"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.17.4",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
+          "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.1.5",
+            "is-regex": "^1.0.5",
+            "object-inspect": "^1.7.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.0",
+            "string.prototype.trimleft": "^2.1.1",
+            "string.prototype.trimright": "^2.1.1"
+          }
+        },
+        "es-to-primitive": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+          "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+          "requires": {
+            "is-callable": "^1.1.4",
+            "is-date-object": "^1.0.1",
+            "is-symbol": "^1.0.2"
+          }
+        },
+        "has-symbols": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+          "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
+        },
+        "is-callable": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
+          "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="
+        },
+        "is-regex": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
+          "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
+          "requires": {
+            "has": "^1.0.3"
+          }
+        }
+      }
+    },
+    "string.prototype.trimleft": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz",
+      "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "function-bind": "^1.1.1"
+      }
+    },
+    "string.prototype.trimright": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz",
+      "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "function-bind": "^1.1.1"
      }
    },
    "string_decoder": {
@@ -10943,29 +11104,65 @@
      "dev": true
    },
    "tape": {
-      "version": "4.11.0",
+      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/tape/-/tape-4.11.0.tgz",
+      "resolved": "https://registry.npmjs.org/tape/-/tape-4.13.0.tgz",
-      "integrity": "sha512-yixvDMX7q7JIs/omJSzSZrqulOV51EC9dK8dM0TzImTIkHWfe2/kFyL5v+d9C+SrCMaICk59ujsqFAVidDqDaA==",
+      "integrity": "sha512-J/hvA+GJnuWJ0Sj8Z0dmu3JgMNU+MmusvkCT7+SN4/2TklW18FNCp/UuHIEhPZwHfy4sXfKYgC7kypKg4umbOw==",
      "requires": {
-        "deep-equal": "~1.0.1",
+        "deep-equal": "~1.1.1",
        "defined": "~1.0.0",
+        "dotignore": "~0.1.2",
        "for-each": "~0.3.3",
        "function-bind": "~1.1.1",
-        "glob": "~7.1.4",
+        "glob": "~7.1.6",
        "has": "~1.0.3",
        "inherits": "~2.0.4",
+        "is-regex": "~1.0.5",
        "minimist": "~1.2.0",
-        "object-inspect": "~1.6.0",
+        "object-inspect": "~1.7.0",
-        "resolve": "~1.11.1",
+        "resolve": "~1.14.2",
        "resumer": "~0.0.0",
-        "string.prototype.trim": "~1.1.2",
+        "string.prototype.trim": "~1.2.1",
        "through": "~2.3.8"
      },
      "dependencies": {
+        "deep-equal": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
+          "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
+          "requires": {
+            "is-arguments": "^1.0.4",
+            "is-date-object": "^1.0.1",
+            "is-regex": "^1.0.4",
+            "object-is": "^1.0.1",
+            "object-keys": "^1.1.1",
+            "regexp.prototype.flags": "^1.2.0"
+          }
+        },
+        "glob": {
+          "version": "7.1.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "is-regex": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
+          "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
+          "requires": {
+            "has": "^1.0.3"
+          }
+        },
        "resolve": {
-          "version": "1.11.1",
+          "version": "1.14.2",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.14.2.tgz",
-          "integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==",
+          "integrity": "sha512-EjlOBLBO1kxsUxsKjLt7TAECyKW6fOh1VRkykQkKGzcBbjjPIxBqGh0jf7GJ3k/f5mxMqW3htMD3WdTUVtW8HQ==",
          "requires": {
            "path-parse": "^1.0.6"
          }
@@ -11295,9 +11492,9 @@
      "dev": true
    },
    "underscore": {
-      "version": "1.9.1",
+      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.2.tgz",
-      "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="
+      "integrity": "sha512-D39qtimx0c1fI3ya1Lnhk3E9nONswSKhnffBI0gME9C99fYOkNi04xs8K6pePLhvl1frbDemkaBQ5ikWllR2HQ=="
    },
    "union-value": {
      "version": "1.0.1",
@@ -13305,9 +13502,9 @@
      "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
    },
    "xmldom": {
-      "version": "0.1.27",
+      "version": "0.1.31",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
+      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz",
-      "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk="
+      "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ=="
    },
    "xmlhttprequest": {
      "version": "1.8.0",

--- a/package.json
+++ b/package.json
@@ -39,18 +39,19 @@
    "cordova-android": "8.0.0",
    "cordova-plugin-device": "^2.0.3",
    "cordova-plugin-geolocation": "^4.0.2",
-    "cordova-plugin-googleplus": "^8.2.1",
+    "cordova-plugin-googleplus": "^8.4.0",
    "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-plugin-x-socialsharing": "^5.6.3",
+    "cordova-plugin-x-socialsharing": "^5.6.4",
    "cordova-sqlite-storage": "^3.4.1",
    "core-js": "^2.6.11",
    "es6-promise-plugin": "^4.2.2",
    "firebase": "^6.6.2",
+    "mx.ferreyra.callnumber": "0.0.2",
    "rxjs": "^6.5.4",
    "rxjs-compat": "^6.5.4",
    "tslib": "^1.9.0",
@@ -105,7 +106,8 @@
      "cordova-plugin-x-socialsharing": {
        "ANDROID_SUPPORT_V4_VERSION": "24.1.1+"
      },
-      "mx.ferreyra.callnumber": {}
+      "mx.ferreyra.callnumber": {},
+      "call-number": {}
    },
    "platforms": [
      "android"

--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -125,8 +125,12 @@ const routes: Routes = [
    path: 'changeaddress',
    loadChildren: './changeaddress/changeaddress.module#ChangeaddressPageModule'
  },
+  {
+    path: 'verficationnumber',
+    loadChildren:
+      './verficationnumber/verficationnumber.module#VerficationnumberPageModule'
+  },
  { path: '', loadChildren: './firstpage/firstpage.module#FirstpagePageModule' }
 ];
 @NgModule({
  imports: [
@@ -134,4 +138,4 @@ const routes: Routes = [
  ],
  exports: [RouterModule]
 })
-export class AppRoutingModule { }
+export class AppRoutingModule {}
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -6,10 +6,7 @@
                    <ion-menu-toggle *ngIf="userData">
                        <div class="top_banner">
                            <div class="top_image">
-                <img
+                                <img [src]="userData.profilePhoto" onerror="this.src='./../assets/asset_avatar.png'" />
-                  [src]="userData.profilePhoto"
-                  onerror="this.src='./../assets/asset_avatar.png'"
-                />
                            </div>
                            <div class="top_detail">
                                <h4>{{ userData.name }}</h4>
@@ -31,10 +28,7 @@
                            <div class="sub_menu">
                                <ul *ngIf="categoryService.activecategories">
                                    <ion-menu-toggle>
-                    <li
+                                        <li *ngFor="let category of categoryService.activecategories" (click)="goToPage('catstorelist', category)">
-                      *ngFor="let category of categoryService.activecategories"
-                      (click)="goToPage('catstorelist', category)"
-                    >
                                            {{ category.catName }}
                                        </li>
                                    </ion-menu-toggle>
@@ -49,9 +43,7 @@
                                <li (click)="vieworder('feedback')">Complaints & Feedback</li>
                            </ion-menu-toggle>
                            <li>
-                <span class="floatLeft" (click)="authService.SignOut()"
+                                <span class="floatLeft" (click)="authService.SignOut()">Logout</span>
-                  >Logout</span
-                >
                                <span class="floatRight version">Version 0.1.0.2</span>
                                <div class="clear"></div>
                            </li>
@@ -65,49 +57,40 @@
 </ion-app>
 <div class="common_tab" [hidden]="fetchCase() === true" *ngIf="!isSearchOpen">
+    <button (click)="istoggle()"></button>
    <ul>
        <li (click)="goToPage('home')">
-      <div
+            <div class="icon_sec m1_icon" [class.m1_icon_act]="sec_active1" (click)="setActive1()"></div>
-        class="icon_sec m1_icon"
-        [class.m1_icon_act]="sec_active1"
-        (click)="setActive1()"
-      ></div>
        </li>
        <li (click)="goToPage('catagory')">
-      <div
+            <div class="icon_sec m2_icon" [class.m2_icon_act]="sec_active2" (click)="setActive2()"></div>
-        class="icon_sec m2_icon"
-        [class.m2_icon_act]="sec_active2"
-        (click)="setActive2()"
-      ></div>
        </li>
        <li (click)="searchModal()">
-      <div
+            <div class="icon_sec m3_icon" [class.m3_icon_act]="sec_active3" (click)="setActive3()"></div>
-        class="icon_sec m3_icon"
-        [class.m3_icon_act]="sec_active3"
-        (click)="setActive3()"
-      ></div>
        </li>
        <li (click)="goToPage('cart')">
-      <div
+            <div class="icon_sec m4_icon" [class.m4_icon_act]="sec_active4" (click)="setActive4()"></div>
-        class="icon_sec m4_icon"
-        [class.m4_icon_act]="sec_active4"
-        (click)="setActive4()"
-      ></div>
        </li>
        <li (click)="goToPage('myorder')">
-      <div
+            <div class="icon_sec m5_icon" [class.m5_icon_act]="sec_active5" (click)="setActive5()"></div>
-        class="icon_sec m5_icon"
-        [class.m5_icon_act]="sec_active5"
-        (click)="setActive5()"
-      ></div>
        </li>
        <li (click)="goToPage('profile')">
-      <div
+            <div class="icon_sec m6_icon" [class.m6_icon_act]="sec_active6" (click)="setActive6()" menuClose></div>
-        class="icon_sec m6_icon"
-        [class.m6_icon_act]="sec_active6"
-        (click)="setActive6()"
-        menuClose
-      ></div>
        </li>
    </ul>
 </div>
+<div class="common-pop-wrapper" *ngIf="isShow" [@slideInOut]>
+    <div class="pop_inner">
+        <div class="img-wrapper">
+            <img src="../assets/model1_2.png" alt="Product">
+        </div>
+        <div class="content">
+            <h1>Order Placed Successfully</h1>
+            <p>Order ID 123456 , Green Churidhar has been successfully orderd. </p>
+        </div>
+        <span (click)="istoggle();"><img src="../assets/close.png" alt="Close"></span>
+    </div>
+</div>
\ No newline at end of file
--- a/src/app/app.component.scss
+++ b/src/app/app.component.scss
@@ -12,6 +12,7 @@
    padding-left: 20px;
    padding-top: 20px;
    padding-right: 10px;
+    padding-bottom: 55px;
    .top_banner {
        .top_image {
            width: 60px;
@@ -165,3 +166,64 @@
        }
    }
 }
+.common-pop-wrapper {
+    width: 100%;
+    height: 90px !important;
+    position: fixed;
+    top: 60px;
+    left: 0px;
+    right: 0px;
+    bottom: 0px;
+    z-index: 99;
+    .pop_inner {
+        margin: 0 auto;
+        width: 95%;
+        padding: 10px;
+        background-color: #fff;
+        box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.3);
+        border-radius: 10px;
+        display: flex;
+        position: relative;
+        .img-wrapper {
+            width: 70px;
+            height: 70px;
+            border-radius: 8px;
+            background-color: #f9f9f9;
+            display: block;
+            img {
+                width: 70px;
+                min-width: 70px;
+                height: 70px;
+                border-radius: 8px;
+                background-color: #f9f9f9;
+            }
+        }
+        .content {
+            display: flex;
+            -webkit-box-align: center;
+            flex-direction: column;
+            text-align: left;
+            justify-content: center;
+            padding-left: 12px;
+            overflow: hidden;
+            h1 {
+                color: rgba(59, 57, 77, 1);
+                margin: 0px;
+                font-weight: bold;
+                font-size: 18px;
+            }
+            p {
+                margin-bottom: 0;
+                line-height: 1;
+                margin-top: 8px;
+            }
+        }
+    }
+    span {
+        width: 20px;
+        position: absolute;
+        right: 4px;
+        top: 4px;
+    }
+}
\ No newline at end of file
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -17,10 +17,23 @@ import { SubjectService } from './../config/subject.service';
 import { CategoriesService } from './../config/category.service';
 import { SearchmodalPage } from './searchmodal/searchmodal.page';
+import { trigger, transition, animate, style } from '@angular/animations';
 @Component({
  selector: 'app-root',
  templateUrl: 'app.component.html',
-  styleUrls: ['app.component.scss']
+  styleUrls: ['app.component.scss'],
+  animations: [
+    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%)' }))
+      ])
+    ])
+  ]
 })
 export class AppComponent {
  isSearchOpen = false;
@@ -40,6 +53,8 @@ export class AppComponent {
  userData: any;
  tabData = true;
+  isShow = false;
  constructor(
    private platform: Platform,
    private splashScreen: SplashScreen,
@@ -118,7 +133,8 @@ export class AppComponent {
      'changeaddress',
      'changedetails',
      'contact',
-      'myorder'
+      'myorder',
+      'review'
    ];
    const currentUrl = this.router.url.split('/');
    const index = restrictedUrl.findIndex(x => x === currentUrl[1]);
@@ -242,4 +258,8 @@ export class AppComponent {
    });
    return await modal.present();
  }
+  istoggle() {
+    this.isShow = !this.isShow;
+  }
 }
--- a/src/app/cart/cart.page.html
+++ b/src/app/cart/cart.page.html
@@ -166,12 +166,15 @@
                            </div> -->
                            <hr />
                            <div class="coupon_code">
+                                <div class="promo-row">
                                    <input class="" placeholder="COUPON CODE: GET50" #promo /><button class="add_btn" (click)="promoApply(promo.value)">
                                        APPLY
                                    </button>
-                                <span *ngIf="discountApplied" style="color: red">Promocode applied successfully
+                                </div>
+                                <span *ngIf="discountApplied" class="promo-success">Promocode applied successfully
                                </span>
                            </div>
                            <br />
                            <h6>

--- a/src/app/cart/cart.page.scss
+++ b/src/app/cart/cart.page.scss
@@ -205,8 +205,9 @@
                }
                .coupon_code {
                    padding-top: 20px;
-                    padding-bottom: 50px;
+                    padding-bottom: 40px;
                    border-bottom: 1px solid #b0aec7;
+                    .promo-row {
                        display: flex;
                        justify-content: space-between;
                        input {
@@ -236,6 +237,14 @@
                            font-weight: bolder;
                        }
                    }
+                    .promo-success {
+                        color: #31b131;
+                        font-size: 16px;
+                        text-align: left;
+                        display: block;
+                        margin-top: 5px;
+                    }
+                }
                .total_div {
                    p {
                        margin: 0px;

--- a/src/app/home/home.page.html
+++ b/src/app/home/home.page.html
@@ -31,8 +31,7 @@
                        <h5>{{center.centerName}}</h5>
                        <p>{{center.description}}</p>
                    </div>
-                    <img [src]="center.centerImg"
+                    <img [src]="center.centerImg" onerror="this.src='./../../assets/getmi_malls/mall_banner/mall_4.png'" />
-                        onerror="this.src='./../../assets/getmi_malls/mall_banner/mall_4.png'" />
                </ion-slide>
            </ion-slides>
        </div>
@@ -40,12 +39,10 @@
            Featured Stores
        </div>
        <div class="featured_slider">
-            <ion-slides pager="false" [options]="slideOpts"
+            <ion-slides pager="false" [options]="slideOpts" *ngIf="shopperService.activeshoppers && shopperService.activeshoppers.length > 0">
-                *ngIf="shopperService.activeshoppers && shopperService.activeshoppers.length > 0">
                <ion-slide *ngFor="let shopper of shopperService.activeshoppers">
                    <div class="feature_product" (click)="goToPage('productlist', shopper)">
-                        <img [src]="shopper.featuredImage"
+                        <img [src]="shopper.featuredImage" onerror="this.src='./../../assets/getmi_malls/featured/featured1.png'" />
-                            onerror="this.src='./../../assets/getmi_malls/featured/featured1.png'" />
                        <div class="feature_overlay">
                            <h5>{{shopper.name}}</h5>
                            <p>{{shopper.caption}}</p>
@@ -74,8 +71,7 @@
            <ul *ngIf="centerService.nearcenters && centerService.nearcenters.length > 0">
                <li *ngFor="let center of centerService.nearcenters" (click)="goToPage('storelist', center)">
                    <div class="nearby_image">
-                        <img [src]="center.centerImg"
+                        <img [src]="center.centerImg" onerror="this.src='./../../assets/getmi_malls/mall_298/mall2.png'" />
-                            onerror="this.src='./../../assets/getmi_malls/mall_298/mall2.png'" />
                    </div>
                    <div class="nearby_detail">
                        <h5>
@@ -96,10 +92,8 @@
        </div>
        <div class="featured_catagory_list">
            <ul *ngIf="categoriesService.activecategories && categoriesService.activecategories.length > 0">
-                <li *ngFor="let categories of categoriesService.activecategories"
+                <li *ngFor="let categories of categoriesService.activecategories" (click)="goToPage('catstorelist', categories)">
-                    (click)="goToPage('catstorelist', categories)">
+                    <img [src]="categories.catImage" onerror="this.src='../assets/handsome-man-outdoors-drinking-coffee-with-sunglasses-guy-with-beard-instagram-effect_1212-818@3x.png'" />
-                    <img [src]="categories.catImage"
-                        onerror="this.src='../assets/handsome-man-outdoors-drinking-coffee-with-sunglasses-guy-with-beard-instagram-effect_1212-818@3x.png'" />
                    <div class="featured_overlay">
                        <h4>{{categories.catName}}</h4>
                    </div>
@@ -119,23 +113,21 @@
        <div class="clear"></div>
    </div>
    <ion-content class="sort_wrappper">
-        <agm-map [zoom]="20" [latitude]="lat" [longitude]="lng" [disableDefaultUI]="false" [zoomControl]="false"
+        <agm-map [zoom]="20" [latitude]="lat" [longitude]="lng" [disableDefaultUI]="false" [zoomControl]="false" [backgroundColor]="'rgba(29, 27, 130,0.2)'">
-            [backgroundColor]="'rgba(29, 27, 130,0.2)'">
            <agm-marker [latitude]="lat" [longitude]="lng"></agm-marker>
        </agm-map>
        <div class="add_address_wrapper">
-            <div class="add-address-c">
+            <h5 class="floatLeft">NEW ADDRESS</h5>
-                <span>NEW ADDRESS</span>
+            <h5 class="floatRight" (click)="istoggle(); goToPage('nearby')">
-                <span (click)="istoggle(); goToPage('nearby')">ADD NEW</span>
+                ADD NEW
-            </div>
+            </h5>
+            <div class="clear"></div>
            <div>
                <ul class="address-ul" *ngIf="addressService.addressList && addressService.addressList.length > 0">
                    <li *ngFor="let address of addressService.addressList; let i = index">
                        <div class="floatLeft">
                            {{address.default}}
-                            <input class="styled-checkbox" name="addressId" id="styled-checkbox-{{i}}" type="radio"
+                            <input class="styled-checkbox" name="addressId" id="styled-checkbox-{{i}}" type="radio" (click)="setDefault(address.addressId)" [value]="address.addressId" #addressType [checked]="address.defaultVal == 1" />
-                                (click)="setDefault(address.addressId)" [value]="address.addressId" #addressType
-                                [checked]="address.defaultVal == 1" />
                            <label for="styled-checkbox-{{i}}">
                                {{address.addressType}}
                            </label>

--- a/src/app/home/home.page.scss
+++ b/src/app/home/home.page.scss
@@ -262,9 +262,9 @@
 .add_address_wrapper {
    position: fixed;
-    top: 40%;
-    overflow: scroll;
    height: auto;
+    max-height: 70%;
+    overflow: scroll;
    bottom: 0px;
    left: 0px;
    right: 0px;

--- a/src/app/nearby/nearby.page.scss
+++ b/src/app/nearby/nearby.page.scss
-    .nearby_map {
+.nearby_map {
    width: 100%;
    height: 100%;
    .overlay {
@@ -130,4 +130,4 @@
            transform: rotate(45deg);
        }
    }
-    }
+}
\ No newline at end of file
--- a/src/app/preference/preference.page.html
+++ b/src/app/preference/preference.page.html
@@ -12,38 +12,28 @@
    <div class="preference-wrapper">
        <div class="pref-wrap-two">
            <ion-grid>
-        <ion-row
+                <ion-row *ngIf="categoriesService.activecategories && categoriesService.activecategories.length > 0">
-          *ngIf="categoriesService.activecategories && categoriesService.activecategories.length > 0"
+                    <ion-col size="6" *ngFor="let categories of categoriesService.categories">
-        >
-          <ion-col
-            size="6"
-            *ngFor="let categories of categoriesService.categories"
-          >
                        <div class="preference-box">
-              <input
+                            <input type="checkbox" class="preference" (click)="selectPrefernce(categories.catId)" [checked]="selectedPref(categories.catId)" />
-                type="checkbox"
+                            <img [src]="categories.catImage" onerror="this.src='../assets/handsome-man-outdoors-drinking-coffee-with-sunglasses-guy-with-beard-instagram-effect_1212-818@3x.png'" />
-                class="preference"
-                (click)="selectPrefernce(categories.catId)"
-                [checked]="selectedPref(categories.catId)"
-              />
-              <img
-                [src]="categories.catImage"
-                onerror="this.src='../assets/handsome-man-outdoors-drinking-coffee-with-sunglasses-guy-with-beard-instagram-effect_1212-818@3x.png'"
-              />
                            <h1>{{categories.catName}}</h1>
                        </div>
                    </ion-col>
                </ion-row>
            </ion-grid>
        </div>
+    </div>
+</ion-content>
+<ion-footer>
    <div class="bottom-button">
        <button class="show-btn" (click)="onSubmit()">
      Continue
    </button>
        <!-- <span>SKIP</span> -->
    </div>
-  </div>
+</ion-footer>
-</ion-content>
 <div class="loader" *ngIf="loader">
    <div class="lds-ripple">
        <div></div>

--- a/src/app/preference/preference.page.scss
+++ b/src/app/preference/preference.page.scss
 .preference-wrapper {
    padding: 20px 20px 110px 20px;
-    .bottom-button {
-        position: fixed;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        background-color: #fff;
-        padding: 20px;
-        text-align: center;
-        z-index: 2;
-        button {
-            width: 100%;
-            background-color: #29285b;
-            color: #fff;
-            border-radius: 8px;
-            height: 45px;
-            font-size: 16px;
-            text-transform: uppercase;
-        }
-        span {
-            text-transform: uppercase;
-            font-size: 16px;
-            text-align: center;
-            margin-top: 10px;
-            display: inline-block;
-            font-weight: 600;
-        }
-    }
    .pref-wrap-two {
        .preference-box {
            width: 100%;
@@ -90,3 +63,31 @@
        }
    }
 }
+.bottom-button {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background-color: #fff;
+    padding: 20px;
+    text-align: center;
+    z-index: 9;
+    button {
+        width: 100%;
+        background-color: #29285b;
+        color: #fff;
+        border-radius: 8px;
+        height: 45px;
+        font-size: 16px;
+        text-transform: uppercase;
+    }
+    span {
+        text-transform: uppercase;
+        font-size: 16px;
+        text-align: center;
+        margin-top: 10px;
+        display: inline-block;
+        font-weight: 600;
+    }
+}
\ No newline at end of file
--- a/src/app/productdetail/productdetail.page.scss
+++ b/src/app/productdetail/productdetail.page.scss
@@ -134,12 +134,11 @@
                        top: 0px;
                        bottom: 0px;
                        padding: 4px;
-                        padding-top: 35px;
-                        padding-bottom: 35px;
                        text-align: center;
                        display: flex;
                        align-items: center;
                        font-size: 14px;
+                        justify-content: center;
                    }
                    #custom_check_button label {
                        width: 100%;

--- a/src/app/profile/profile.page.html
+++ b/src/app/profile/profile.page.html
@@ -16,10 +16,7 @@
      </div> -->
            <div class="profile_circle">
-        <img
+                <img [src]="loggedUser.profilePhoto" onerror="this.src='./../assets/asset_avatar.png'" />
-          [src]="loggedUser.profilePhoto"
-          onerror="this.src='./../assets/asset_avatar.png'"
-        />
                <div class="edit"></div>
                <input type="file" accept="image/*" (change)="fileChange($event)" />
            </div>
@@ -30,11 +27,8 @@
        <div class="account_wrapper">
            <div class="account_header">
                <h5 class="floatLeft">ACCOUNT INFORMATION</h5>
-        <span
+                <span class="floatRight" (click)="goToPage('changedetails', user && user)"><img
-          class="floatRight"
+            src="../../assets/edit.png" /></span>
-          (click)="goToPage('changedetails', user && user)"
-          ><img src="../../assets/edit.png"
-        /></span>
                <div class="clear"></div>
            </div>
            <div class="row">
@@ -46,12 +40,9 @@
                    </ion-col>
                    <ion-col class="textRight p0">
                        <h6>{{loggedUser.phone}}</h6>
-            <span class="ar-span" *ngIf="loggedUser.phoneVerified == true"
+                        <span class="ar-span" *ngIf="loggedUser.phoneVerified == true">Verified</span>
-              >Verified</span
+                        <span class="ar-span" *ngIf="loggedUser.phoneVerified == false" (click)="goToPage('verficationnumber')">Not
-            >
+              Verified yet</span>
-            <span class="ar-span" *ngIf="loggedUser.phoneVerified == false"
-              >Not Verified yet</span
-            >
                    </ion-col>
                </ion-row>
            </div>
@@ -64,12 +55,8 @@
                    </ion-col>
                    <ion-col class="textRight p0">
                        <h6>{{loggedUser.emailId}}</h6>
-            <span class="ar-span" *ngIf="loggedUser.emailVerified == true"
+                        <span class="ar-span" *ngIf="loggedUser.emailVerified == true">Verified</span>
-              >Verified</span
+                        <span class="ar-span" *ngIf="loggedUser.emailVerified == false">Not Verified yet</span>
-            >
-            <span class="ar-span" *ngIf="loggedUser.emailVerified == false"
-              >Not Verified yet</span
-            >
                    </ion-col>
                </ion-row>
            </div>
@@ -148,10 +135,7 @@
                    <button class="btn-cancel floatLeft" (click)="istoggle();">
            Cancel
          </button>
-          <button
+                    <button class="btn-logout floatRight" (click)="authService.SignOut(); istoggle()">
-            class="btn-logout floatRight"
-            (click)="authService.SignOut(); istoggle()"
-          >
            Logout
          </button>
                </div>

--- a/src/app/review/review.page.html
+++ b/src/app/review/review.page.html
@@ -11,22 +11,19 @@
    <div class="nearby_shop_list">
        <ul>
            <li (click)="goToPage('productlist')">
-                <div class="nearby_image"></div>
+                <div class="nearby_image">
+                    <img src="../../assets/2193bb91-3be9-4de9-96f4-4ce7aab8547e1558436499234-RARE-Women-Black-Printed-A-Line-Dress-6731558436495088-1@3x.png" alt="">
+                </div>
                <div class="nearby_detail">
-                    <h5>
+                    <h5> Carnival Life</h5>
-                        <span class="floatLeft">Carnival Life</span>
+                    <p><span><img src="../assets/Path61_2.png"> 4</span> Men's & Women's Fashion</p>
-                        <span class="floatRight">4
-              <img src="../assets/Path61_2.png">
-            </span>
-                        <div class="clear"></div>
-                    </h5>
-                    <p>Men's & Women's Fashion</p>
                </div>
                <div class="clear"></div>
            </li>
        </ul>
    </div>
    <div class="rating_div">
+        <h5>Rate Us</h5>
        <fieldset class="rating">
            <input type="radio" id="star5" name="rating" value="5" /><label class="full" for="star5" title="Awesome - 5 stars"></label>
            <input type="radio" id="star4half" name="rating" value="4 and a half" /><label class="half" for="star4half" title="Pretty good - 4.5 stars"></label>
@@ -41,4 +38,10 @@
        </fieldset>
    </div>
+    <div class="form_div">
+        <p>Comments</p>
+        <textarea required name="message" class="form-control" rows="8" placeholder="Type here.."></textarea>
+        <button class="login_btn"> SUBMIT </button>
+    </div>
 </ion-content>
\ No newline at end of file
--- a/src/app/review/review.page.scss
+++ b/src/app/review/review.page.scss
 .nearby_shop_list {
     ul {
-         margin: 0px;
+         margin-top: 25px;
         padding: 10px;
         padding-left: 20px;
         padding-right: 20px;
@@ -15,6 +15,7 @@
                 img {
                     width: 100%;
                     height: 100%;
+                     border-radius: 8px;
                     object-fit: cover;
                     object-position: center;
                 }
@@ -30,14 +31,14 @@
                     color: rgba(59, 57, 77, 1);
                     font-weight: 900;
                     padding-bottom: 2px;
-                     img {
-                         width: 16px;
-                     }
                 }
                 p {
                     margin: 0px;
                     padding: 0px;
                     color: rgba(176, 174, 199);
+                     img {
+                         width: 16px;
+                     }
                 }
             }
         }
@@ -45,10 +46,22 @@
 }
 .rating_div {
+     margin: 0px;
+     padding: 10px;
+     padding-left: 20px;
+     padding-right: 20px;
+     display: flex;
+     h5 {
+         margin: 0px;
+         padding: 0px;
+         color: #3b394d;
+         font-weight: 900;
+         display: flex;
+         align-items: center;
+     }
     .rating {
         border: none;
         width: 250px;
-         margin: 0 auto;
         padding-top: 20px;
         padding-bottom: 20px;
     }
@@ -88,3 +101,42 @@
         color: rgba(41, 40, 91, 1);
     }
 }
+ .form_div {
+     padding: 10px;
+     padding-left: 20px;
+     padding-right: 20px;
+     .form-control {
+         border: 1px solid rgba(215, 213, 228, 1);
+         background: transparent;
+         color: #000;
+         width: 100%;
+         border-radius: 8px;
+         font-size: 16px;
+         padding: 11px 15px;
+         resize: none;
+         outline: none;
+         transition: all .4s ease-in-out;
+         &::placeholder {
+             color: rgba(215, 213, 228, 1);
+         }
+         &:focus {
+             border: 1px solid #f3d09f;
+             box-shadow: 3px 3px 6px 0px rgba(202, 154, 83, 0.11);
+         }
+     }
+     .login_btn {
+         width: 100%;
+         background-color: #29285b;
+         color: #fff;
+         border-radius: 8px;
+         height: 45px;
+         font-size: 16px;
+         margin-top: 30px;
+     }
+     p {
+         color: #3b394d;
+         font-weight: 900;
+         margin-top: 0;
+     }
+ }
\ No newline at end of file
--- a/src/app/verficationnumber/verficationnumber.module.ts
+++ b/src/app/verficationnumber/verficationnumber.module.ts
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { Routes, RouterModule } from '@angular/router';
+import { IonicModule } from '@ionic/angular';
+import { VerficationnumberPage } from './verficationnumber.page';
+const routes: Routes = [
+  {
+    path: '',
+    component: VerficationnumberPage
+  }
+];
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    RouterModule.forChild(routes)
+  ],
+  declarations: [VerficationnumberPage]
+})
+export class VerficationnumberPageModule {}
--- a/src/app/verficationnumber/verficationnumber.page.html
+++ b/src/app/verficationnumber/verficationnumber.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>VERIFICATION</h4>
+    </div>
+    <div class="clear"></div>
+</div>
+<ion-content>
+    <div class="verification_div" *ngIf="authService.userPostData">
+        <div class="form_div">
+            <div class="row">
+                <p>We have sent and OTP to</p>
+                <h6>+01 {{authService.userPostData.phone}}</h6>
+            </div>
+            <div class="row">
+                <input class="" type="number" placeholder="Type OTP" maxlength="4" #otp required />
+            </div>
+            <div class="row">
+                <button class="login_btn" (click)="authService.verify(otp.value)">
+          SUBMIT
+        </button>
+            </div>
+            <div class="row">
+                <button class="resend_btn" (click)="authService.resend()">
+          RESEND
+        </button>
+            </div>
+            <h6>OTP: {{authService.userPostData.otp}}</h6>
+        </div>
+    </div>
+    <div class="loader" *ngIf="authService.loader">
+        <div class="lds-ripple">
+            <div></div>
+            <div></div>
+        </div>
+    </div>
+</ion-content>
\ No newline at end of file
--- a/src/app/verficationnumber/verficationnumber.page.scss
+++ b/src/app/verficationnumber/verficationnumber.page.scss
+ .verification_div {
+     width: 80%;
+     margin: 0 auto;
+     .form_div {
+         padding-top: 30%;
+         .row {
+             margin-bottom: 20px;
+             input {
+                 border: 1px solid rgba(215, 213, 228, 1);
+                 background: transparent;
+                 color: #000;
+                 width: 100%;
+                 height: 45px;
+                 text-align: center;
+                 border-radius: 8px;
+                 font-size: 16px;
+                 outline: none;
+                 transition: all .4s ease-in-out;
+                 &::placeholder {
+                     color: rgba(215, 213, 228, 1);
+                 }
+                 &:focus {
+                     border: 1px solid #f3d09f;
+                     box-shadow: 3px 3px 6px 0px rgba(202, 154, 83, 0.11);
+                 }
+             }
+             .login_btn {
+                 width: 100%;
+                 background-color: #29285b;
+                 color: #fff;
+                 border-radius: 8px;
+                 height: 45px;
+                 font-size: 16px;
+             }
+             .resend_btn {
+                 width: 100%;
+                 background-color: transparent;
+                 color: #29285b;
+                 border-radius: 8px;
+                 height: 45px;
+                 font-size: 16px;
+                 font-weight: 900;
+             }
+             hr {
+                 border: 1px solid rgba(215, 213, 228, 1);
+                 border-bottom: none;
+                 margin-top: 30px;
+                 margin-bottom: 10px;
+             }
+             P {
+                 text-align: center;
+                 color: rgba(59, 57, 77, 1);
+                 margin: 0px;
+                 text-align: center;
+                 span {
+                     background-color: #fff;
+                     padding: 10px;
+                     font-size: 18px;
+                 }
+             }
+             h4 {
+                 color: rgba(59, 57, 77, 1);
+                 text-align: center;
+                 margin: 0px;
+                 padding-top: 15px;
+             }
+             h6 {
+                 color: rgba(41, 40, 91, 1);
+                 text-align: center;
+                 font-weight: bold;
+                 padding-bottom: 20%;
+                 font-size: 25px;
+                 .styled-checkbox {
+                     position: absolute;
+                     opacity: 0;
+                     &+label {
+                         position: relative;
+                         cursor: pointer;
+                         padding: 0;
+                     }
+                     &+label:before {
+                         content: '';
+                         margin-right: 10px;
+                         display: inline-block;
+                         vertical-align: text-top;
+                         width: 30px;
+                         height: 30px;
+                         border-radius: 10px;
+                         background: white;
+                         border: 1px solid rgba(215, 213, 228, 1);
+                     }
+                     // Box checked
+                     &:checked+label:before {
+                         background: #29285b;
+                     }
+                     // Disabled state label.
+                     &:disabled+label {
+                         color: #b8b8b8;
+                         cursor: auto;
+                     }
+                     // Disabled box.
+                     &:disabled+label:before {
+                         box-shadow: none;
+                         background: #ddd;
+                     }
+                     // Checkmark. Could be replaced with an image
+                     &:checked+label:after {
+                         content: '';
+                         position: absolute;
+                         left: 10px;
+                         top: 15px;
+                         background: white;
+                         width: 2px;
+                         height: 2px;
+                         box-shadow: 2px 0 0 white, 4px 0 0 white, 4px -2px 0 white, 4px -4px 0 white, 4px -6px 0 white, 4px -8px 0 white;
+                         transform: rotate(45deg);
+                     }
+                 }
+             }
+             .social_div {
+                 border: 1px solid rgba(215, 213, 228, 1);
+                 height: 45px;
+                 border-radius: 20px;
+                 .social_btn {
+                     display: inline-block;
+                     width: 50%;
+                     text-align: center;
+                     height: 100%;
+                     font-size: 18px;
+                     padding: 9px;
+                 }
+             }
+         }
+     }
+ }
\ No newline at end of file
--- a/src/app/verficationnumber/verficationnumber.page.spec.ts
+++ b/src/app/verficationnumber/verficationnumber.page.spec.ts
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { VerficationnumberPage } from './verficationnumber.page';
+describe('VerficationnumberPage', () => {
+  let component: VerficationnumberPage;
+  let fixture: ComponentFixture<VerficationnumberPage>;
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ VerficationnumberPage ],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
+    })
+    .compileComponents();
+  }));
+  beforeEach(() => {
+    fixture = TestBed.createComponent(VerficationnumberPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
--- a/src/app/verficationnumber/verficationnumber.page.ts
+++ b/src/app/verficationnumber/verficationnumber.page.ts
+import { Component, OnInit } from '@angular/core';
+import { Location } from '@angular/common';
+import { Router, ActivatedRoute } from '@angular/router';
+import { AuthService } from './../../config/auth.service';
+@Component({
+  selector: 'app-verficationnumber',
+  templateUrl: './verficationnumber.page.html',
+  styleUrls: ['./verficationnumber.page.scss']
+})
+export class VerficationnumberPage implements OnInit {
+  constructor(
+    private router: Router,
+    private route: ActivatedRoute,
+    private location: Location,
+    public authService: AuthService
+  ) {}
+  ngOnInit() {}
+  goToPage(path, data = null) {
+    this.router.navigateByUrl(path, { queryParams: data });
+    document.body.scrollTop = document.documentElement.scrollTop = 0;
+  }
+  goBack() {
+    this.location.back();
+  }
+}
--- a/src/global.scss
+++ b/src/global.scss
@@ -62,7 +62,7 @@
 --------------------------------*/
 @import url('https://fonts.googleapis.com/css?family=Abel&display=swap');
-@import url(//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css);
+@import url('//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css');
 * {
    font-family: 'Abel', sans-serif;
    -webkit-font-smoothing: antialiased;