From 2f8a0fa01c1c08e4290ee387799a383c9dcda126 Mon Sep 17 00:00:00 2001 From: Rohit Sah Date: Tue, 6 Jun 2023 12:39:55 +0545 Subject: [PATCH 1/3] signup change --- db.json | 21 ++++++ package-lock.json | 127 +++++++++----------------------- src/api/auth.js | 56 +++++++------- src/index.js | 2 - src/views/auth/Login/Form.js | 122 ++++++++++++++---------------- src/views/auth/Login/index.js | 12 +-- src/views/auth/Signup/Signup.js | 96 ++++++++++++------------ src/views/auth/Signup/index.js | 10 +-- src/views/auth/Signup/sign.css | 7 ++ 9 files changed, 203 insertions(+), 250 deletions(-) create mode 100644 src/views/auth/Signup/sign.css diff --git a/db.json b/db.json index cbd9977..74bd290 100644 --- a/db.json +++ b/db.json @@ -49,6 +49,27 @@ "0": {} }, "id": "d2100bb1-009e-4ea3-b92a-66fb440987d1" + }, + { + "name": "Rohit", + "phone": "1111111111", + "email": "rohit@gmail.com", + "password": "123456", + "id": "cf858cdb-1670-4f2a-bd3f-2bb02b61a266" + }, + { + "name": "Rohit", + "phone": "1111111111", + "email": "rohit@gmail.com", + "password": "123456", + "id": "c869c9cf-2740-4c91-bced-851c4e0fdd9f" + }, + { + "name": "Rohit ", + "phone": "1111111111", + "email": "rohit@gmail.com", + "password": "123456", + "id": "01a08dad-018a-475a-a42d-af1797bc6fe0" } ], "blog": [ diff --git a/package-lock.json b/package-lock.json index 59e50de..660976a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16467,19 +16467,6 @@ "is-typedarray": "^1.0.0" } }, - "node_modules/typescript": { - "version": "4.7.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.3.tgz", - "integrity": "sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==", - "peer": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=4.2.0" - } - }, "node_modules/unbox-primitive": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", @@ -18918,14 +18905,12 @@ "@csstools/postcss-unset-value": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.1.tgz", - "integrity": "sha512-f1G1WGDXEU/RN1TWAxBPQgQudtLnLQPyiWdtypkPC+mVYNKFKH/HYXSxH4MVNqwF8M0eDsoiU7HumJHCg/L/jg==", - "requires": {} + "integrity": "sha512-f1G1WGDXEU/RN1TWAxBPQgQudtLnLQPyiWdtypkPC+mVYNKFKH/HYXSxH4MVNqwF8M0eDsoiU7HumJHCg/L/jg==" }, "@csstools/selector-specificity": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.1.tgz", - "integrity": "sha512-aG20vknL4/YjQF9BSV7ts4EWm/yrjagAN7OWBNmlbEOUiu0llj4OGrFoOKK3g2vey4/p2omKCoHrWtPxSwV3HA==", - "requires": {} + "integrity": "sha512-aG20vknL4/YjQF9BSV7ts4EWm/yrjagAN7OWBNmlbEOUiu0llj4OGrFoOKK3g2vey4/p2omKCoHrWtPxSwV3HA==" }, "@eslint/eslintrc": { "version": "1.3.0", @@ -20535,14 +20520,12 @@ "acorn-import-assertions": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", - "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", - "requires": {} + "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==" }, "acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "requires": {} + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==" }, "acorn-node": { "version": "1.8.2", @@ -20628,8 +20611,7 @@ "ajv-keywords": { "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "requires": {} + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==" }, "ansi-escapes": { "version": "4.3.2", @@ -20951,8 +20933,7 @@ "babel-plugin-named-asset-import": { "version": "0.3.8", "resolved": "https://registry.npmjs.org/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.8.tgz", - "integrity": "sha512-WXiAc++qo7XcJ1ZnTYGtLxmBCVbddAml3CEXgWaBzNzLNoxtQ8AiGEFDMOhot9XjTCQbvP5E77Fj9Gk924f00Q==", - "requires": {} + "integrity": "sha512-WXiAc++qo7XcJ1ZnTYGtLxmBCVbddAml3CEXgWaBzNzLNoxtQ8AiGEFDMOhot9XjTCQbvP5E77Fj9Gk924f00Q==" }, "babel-plugin-polyfill-corejs2": { "version": "0.3.1", @@ -21650,8 +21631,7 @@ "css-declaration-sorter": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.0.tgz", - "integrity": "sha512-OGT677UGHJTAVMRhPO+HJ4oKln3wkBTwtDFH0ojbqm+MJm6xuDMHp2nkhh/ThaBqq20IbraBQSWKfSLNHQO9Og==", - "requires": {} + "integrity": "sha512-OGT677UGHJTAVMRhPO+HJ4oKln3wkBTwtDFH0ojbqm+MJm6xuDMHp2nkhh/ThaBqq20IbraBQSWKfSLNHQO9Og==" }, "css-has-pseudo": { "version": "3.0.4", @@ -21734,8 +21714,7 @@ "css-prefers-color-scheme": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz", - "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==", - "requires": {} + "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==" }, "css-select": { "version": "4.3.0", @@ -21839,8 +21818,7 @@ "cssnano-utils": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz", - "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==", - "requires": {} + "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==" }, "csso": { "version": "4.2.0", @@ -22514,15 +22492,13 @@ "version": "17.0.0", "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz", "integrity": "sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg==", - "dev": true, - "requires": {} + "dev": true }, "eslint-config-standard-jsx": { "version": "11.0.0", "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-11.0.0.tgz", "integrity": "sha512-+1EV/R0JxEK1L0NGolAr8Iktm3Rgotx3BKwgaX+eAuSX8D952LULKtjgZD3F+e6SvibONnhLwoTi9DPxN5LvvQ==", - "dev": true, - "requires": {} + "dev": true }, "eslint-import-resolver-node": { "version": "0.3.6", @@ -22731,8 +22707,7 @@ "version": "6.1.1", "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz", "integrity": "sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig==", - "dev": true, - "requires": {} + "dev": true }, "eslint-plugin-react": { "version": "7.30.0", @@ -22782,8 +22757,7 @@ "eslint-plugin-react-hooks": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz", - "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==", - "requires": {} + "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==" }, "eslint-plugin-testing-library": { "version": "5.5.1", @@ -23849,8 +23823,7 @@ "icss-utils": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", - "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", - "requires": {} + "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==" }, "idb": { "version": "6.1.5", @@ -24893,8 +24866,7 @@ "jest-pnp-resolver": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz", - "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==", - "requires": {} + "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==" }, "jest-regex-util": { "version": "27.5.1", @@ -26928,8 +26900,7 @@ "postcss-browser-comments": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/postcss-browser-comments/-/postcss-browser-comments-4.0.0.tgz", - "integrity": "sha512-X9X9/WN3KIvY9+hNERUqX9gncsgBA25XaeR+jshHz2j8+sYyHktHw1JdKuMjeLpGktXidqDhA7b/qm1mrBDmgg==", - "requires": {} + "integrity": "sha512-X9X9/WN3KIvY9+hNERUqX9gncsgBA25XaeR+jshHz2j8+sYyHktHw1JdKuMjeLpGktXidqDhA7b/qm1mrBDmgg==" }, "postcss-calc": { "version": "8.2.4", @@ -27027,26 +26998,22 @@ "postcss-discard-comments": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz", - "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==", - "requires": {} + "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==" }, "postcss-discard-duplicates": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz", - "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==", - "requires": {} + "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==" }, "postcss-discard-empty": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz", - "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==", - "requires": {} + "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==" }, "postcss-discard-overridden": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz", - "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==", - "requires": {} + "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==" }, "postcss-double-position-gradients": { "version": "3.1.1", @@ -27068,8 +27035,7 @@ "postcss-flexbugs-fixes": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-5.0.2.tgz", - "integrity": "sha512-18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ==", - "requires": {} + "integrity": "sha512-18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ==" }, "postcss-focus-visible": { "version": "6.0.4", @@ -27090,14 +27056,12 @@ "postcss-font-variant": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz", - "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==", - "requires": {} + "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==" }, "postcss-gap-properties": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.3.tgz", - "integrity": "sha512-rPPZRLPmEKgLk/KlXMqRaNkYTUpE7YC+bOIQFN5xcu1Vp11Y4faIXv6/Jpft6FMnl6YRxZqDZG0qQOW80stzxQ==", - "requires": {} + "integrity": "sha512-rPPZRLPmEKgLk/KlXMqRaNkYTUpE7YC+bOIQFN5xcu1Vp11Y4faIXv6/Jpft6FMnl6YRxZqDZG0qQOW80stzxQ==" }, "postcss-image-set-function": { "version": "4.0.6", @@ -27120,8 +27084,7 @@ "postcss-initial": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz", - "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==", - "requires": {} + "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==" }, "postcss-js": { "version": "4.0.0", @@ -27162,14 +27125,12 @@ "postcss-logical": { "version": "5.0.4", "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz", - "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==", - "requires": {} + "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==" }, "postcss-media-minmax": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz", - "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==", - "requires": {} + "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==" }, "postcss-merge-longhand": { "version": "5.1.5", @@ -27230,8 +27191,7 @@ "postcss-modules-extract-imports": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", - "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==", - "requires": {} + "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==" }, "postcss-modules-local-by-default": { "version": "4.0.0", @@ -27289,8 +27249,7 @@ "postcss-normalize-charset": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz", - "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==", - "requires": {} + "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==" }, "postcss-normalize-display-values": { "version": "5.1.0", @@ -27375,14 +27334,12 @@ "postcss-overflow-shorthand": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.3.tgz", - "integrity": "sha512-CxZwoWup9KXzQeeIxtgOciQ00tDtnylYIlJBBODqkgS/PU2jISuWOL/mYLHmZb9ZhZiCaNKsCRiLp22dZUtNsg==", - "requires": {} + "integrity": "sha512-CxZwoWup9KXzQeeIxtgOciQ00tDtnylYIlJBBODqkgS/PU2jISuWOL/mYLHmZb9ZhZiCaNKsCRiLp22dZUtNsg==" }, "postcss-page-break": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz", - "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==", - "requires": {} + "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==" }, "postcss-place": { "version": "7.0.4", @@ -27474,8 +27431,7 @@ "postcss-replace-overflow-wrap": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz", - "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==", - "requires": {} + "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==" }, "postcss-selector-not": { "version": "6.0.0", @@ -27851,8 +27807,7 @@ "react-hook-form": { "version": "7.43.9", "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.43.9.tgz", - "integrity": "sha512-AUDN3Pz2NSeoxQ7Hs6OhQhDr6gtF9YRuutGDwPQqhSUAHJSgGl2VeY3qN19MG0SucpjgDiuMJ4iC5T5uB+eaNQ==", - "requires": {} + "integrity": "sha512-AUDN3Pz2NSeoxQ7Hs6OhQhDr6gtF9YRuutGDwPQqhSUAHJSgGl2VeY3qN19MG0SucpjgDiuMJ4iC5T5uB+eaNQ==" }, "react-is": { "version": "17.0.2", @@ -27949,8 +27904,7 @@ "react-table": { "version": "7.8.0", "resolved": "https://registry.npmjs.org/react-table/-/react-table-7.8.0.tgz", - "integrity": "sha512-hNaz4ygkZO4bESeFfnfOft73iBUj8K5oKi1EcSHPAibEydfsX2MyU6Z8KCr3mv3C9Kqqh71U+DhZkFvibbnPbA==", - "requires": {} + "integrity": "sha512-hNaz4ygkZO4bESeFfnfOft73iBUj8K5oKi1EcSHPAibEydfsX2MyU6Z8KCr3mv3C9Kqqh71U+DhZkFvibbnPbA==" }, "read-cache": { "version": "1.0.0", @@ -28835,8 +28789,7 @@ "style-loader": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz", - "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==", - "requires": {} + "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==" }, "stylehacks": { "version": "5.1.0", @@ -29241,12 +29194,6 @@ "is-typedarray": "^1.0.0" } }, - "typescript": { - "version": "4.7.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.3.tgz", - "integrity": "sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==", - "peer": true - }, "unbox-primitive": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", @@ -29594,8 +29541,7 @@ "ws": { "version": "8.8.0", "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.0.tgz", - "integrity": "sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==", - "requires": {} + "integrity": "sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==" } } }, @@ -30029,8 +29975,7 @@ "ws": { "version": "7.5.8", "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.8.tgz", - "integrity": "sha512-ri1Id1WinAX5Jqn9HejiGb8crfRio0Qgu8+MtL36rlTA6RLsMdWt1Az/19A2Qij6uSHUMphEFaTKa4WG+UNHNw==", - "requires": {} + "integrity": "sha512-ri1Id1WinAX5Jqn9HejiGb8crfRio0Qgu8+MtL36rlTA6RLsMdWt1Az/19A2Qij6uSHUMphEFaTKa4WG+UNHNw==" }, "xdg-basedir": { "version": "4.0.0", diff --git a/src/api/auth.js b/src/api/auth.js index 274f6f4..34c326e 100644 --- a/src/api/auth.js +++ b/src/api/auth.js @@ -1,40 +1,34 @@ import axios from "./index"; import { BASE_URL } from "../config/constants"; class AuthApi { + static login = async (params) => { + return axios.get(`/user/`, params); + }; - static login = (params) => { - return axios.get(`/user/`, params) + static signup = async (params) => { + try { + return await axios.post(`/user/`, params); + } catch (e) { + console.log("error", e); + return false; } + }; - static signup = (data) => { - return axios({ - method: 'post', - url: `${BASE_URL}/user`, - data: data - }) - } - - static createBlog = (blog) => { - return axios({ - method: 'post', - url: `${BASE_URL}/blog`, - data: blog - }) - } + static getBlog = (blog) => { + return axios.get(`${BASE_URL}/blog`, blog); + }; - static getBlog = (blog, page, limit) => { - return axios.get(`${BASE_URL}/blog?_page=${page}&_limit=${limit}`, blog) - } - - static signin = (data) => { - return axios.post(`${base}/auth/signin`,data) - } - static Register = (data) => { - return axios.post(`${base}/register`, data); - }; - static Logout = (data) => { - return axios.post(`${base}/logout`, data, { headers: { Authorization: `${data.token}` } }); - }; + static signin = (data) => { + return axios.post(`${base}/auth/signin`, data); + }; + static Register = (data) => { + return axios.post(`${base}/register`, data); + }; + static Logout = (data) => { + return axios.post(`${base}/logout`, data, { + headers: { Authorization: `${data.token}` }, + }); + }; } let base = "users"; -export default AuthApi; \ No newline at end of file +export default AuthApi; diff --git a/src/index.js b/src/index.js index 13c392a..c84cc98 100644 --- a/src/index.js +++ b/src/index.js @@ -6,7 +6,6 @@ import { BrowserRouter as Router, Routes, Route } from "react-router-dom"; import Feed from "./views/feed"; import Login from "./views/auth/Login"; import Signup from "./views/auth/Signup/index"; -import CreateBlog from "./views/feed/CreateBlog" import Dashboard from "./views/dashboard"; import EmployeeForm from "./views/employees/Form"; import { Profile } from "./views/employees/Profile"; @@ -41,7 +40,6 @@ root.render( } /> } /> } /> - } /> diff --git a/src/views/auth/Login/Form.js b/src/views/auth/Login/Form.js index a870018..bb60b81 100644 --- a/src/views/auth/Login/Form.js +++ b/src/views/auth/Login/Form.js @@ -5,9 +5,6 @@ import Swal from "sweetalert2"; import { useAuth } from "../../../context/AuthProvider"; import { useNavigate, Link } from "react-router-dom"; import { PROFILE_URL } from "../../../config/url"; -import InputField from "../../../components/fields/InputField"; -import Button from "../../../components/fields/Button"; - const LoginForm = () => { const { register, @@ -17,23 +14,17 @@ const LoginForm = () => { const { user, setUser } = useAuth(); const navigate = useNavigate(); - // useEffect(() => { - // if (user) { - // console.log("user", user); - // // navigate(PROFILE_URL); - // } - // }, [user]); - + useEffect(() => { + if (user) { + console.log("user", user); + } + }, [user]); - const onSubmit = (data) => { - // setUser(data); localStorage.setItem("user =---->", JSON.stringify(data)); - // call an API to login - // when api gives success response, navigate to root url - AuthApi.login(data).then((result) => { - console.log("signin -> ", result); + AuthApi.login(data).then((result) => { + console.log("signin -> ", result); if (result.status === 200) { navigate(PROFILE_URL); Swal.fire({ @@ -43,13 +34,8 @@ const LoginForm = () => { Swal.showLoading(); }, willClose: () => { - // localStorage.setItem( - // "access_token", - // result.data.tokens.access_token - // ); localStorage.setItem("user", JSON.stringify(result.data)); setUser(result.data); - Swal.fire({ icon: "success", title: "Successfully logged in!", @@ -81,70 +67,76 @@ const LoginForm = () => { return (
- + {errors.name && This field is required} +
+
+ + {errors.email && ( + + {errors.email.type === "required" + ? "This field is required" + : "Invalid email address"} + + )}
- + {errors.password && ( + + {errors.password.type === "required" + ? "This field is required" + : "Password must have at least 6 characters"} + + )}
-
- - - - +
+ + + +
-
+
- - + + Sign in with Facebook +
); diff --git a/src/views/auth/Login/index.js b/src/views/auth/Login/index.js index 249847c..9ae31aa 100644 --- a/src/views/auth/Login/index.js +++ b/src/views/auth/Login/index.js @@ -4,12 +4,12 @@ import "../auth.scss"; const Login = () => { return ( -
-
-
-
-
-
Sign In
+
+
+
+ diff --git a/src/views/auth/Signup/Signup.js b/src/views/auth/Signup/Signup.js index 70df231..380d9b6 100644 --- a/src/views/auth/Signup/Signup.js +++ b/src/views/auth/Signup/Signup.js @@ -3,11 +3,9 @@ import { useForm } from "react-hook-form"; import AuthApi from "../../../api/auth"; import Swal from "sweetalert2"; import { generateId } from "../../../utils"; -import { useAuth } from "../../../context/AuthProvider"; -import InputField from "../../../components/fields/InputField"; import { useNavigate } from "react-router-dom"; -import { ROOT_URL, LOGIN_URL } from "../../../config/url"; -import { useMutation, useQuery, useQueryClient } from "react-query"; +import { LOGIN_URL } from "../../../config/url"; +import "./sign.css"; const SignupForm = () => { const { register, @@ -16,43 +14,46 @@ const SignupForm = () => { } = useForm(); const navigate = useNavigate(); - const { user, setUser } = useAuth(); + const [user, setUser] = useState({ + name: "", + phone: "", + email: "", + password: "", + profilePhoto: "", + }); - const queryClient = useQueryClient(); + const onSubmit = (data) => { + console.log("Invalid data", data); + const newUser = data; + newUser.id = generateId(); - const { mutate, isLoading } = useMutation(AuthApi.createBlog, { - onSuccess: data => { - const newUser = data.data; - newUser.id = generateId(); - console.log("Data data ---> ", newUser); - localStorage.setItem("employees_data", JSON.stringify(newUser)); - setUser(newUser); - navigate(LOGIN_URL); - Swal.fire({ - icon: "success", - title: "Added!", - text: `${newUser.name} 's data has been Added.`, - showConfirmButton: false, - timer: 1500, - }); - }, - onError: () => { - alert("there was an error") - Swal.fire({ - icon: "failure", - title: "Failed!", - text: `Data has not been Added.`, - showConfirmButton: false, - timer: 1500, - }); - }, - onSettled: () => { - queryClient.invalidateQueries('employees'); - } - }); + AuthApi.signup(newUser).then((result) => { + console.log(result); + if (result.status === 201) { + localStorage.setItem("employees_data", JSON.stringify(data)); + setUser(newUser); + navigate(LOGIN_URL); + Swal.fire({ + icon: "failure", + title: "Failed!", + text: `${data.name} 's data has not been Added.`, + showConfirmButton: false, + timer: 1500, + }); + } else { + Swal.fire({ + icon: "success", + title: "Added!", + text: `${data.name} 's data has been Added.`, + showConfirmButton: false, + timer: 1500, + }); + } + }); + }; return ( -
+
{ {...register("name", { required: true })} placeholder="Name" /> - {errors.name && Required*} + {errors.name && Do not forget to fill Your Name*}
@@ -69,7 +70,9 @@ const SignupForm = () => { {...register("phone", { required: true })} placeholder="Phone Number" /> - {errors.phone && Required*} + {errors.phone && ( + Do not forget to fill your contact number* + )}
@@ -79,9 +82,9 @@ const SignupForm = () => { placeholder="Email" /> {errors.email && ( - + {errors.email.type === "required" - ? "This field is required*" + ? "Do Not Forget to Fill Your Email*" : "Invalid email address*"} )} @@ -93,20 +96,15 @@ const SignupForm = () => { {...register("password", { required: true })} placeholder="Password" /> - {errors.password && Required*} + {errors.password && Do not forget to fill your Password*}
- - {errors.profilePhoto && Required*} +

); }; -export default BlogForm; +export default Cartname; diff --git a/src/views/feed/index.js b/src/views/feed/index.js index 99a3a39..7c89e97 100644 --- a/src/views/feed/index.js +++ b/src/views/feed/index.js @@ -77,7 +77,7 @@ const Feed = () => {
- +
@@ -108,7 +108,7 @@ const Feed = () => {

- {feed.createdAt} + {feed.chooseDate}