login

tsx
2023-05-15 20:53:19 +05:30 · 2023-05-15 17:57:16 +05:30 · 2023-05-15 14:27:10 +05:30 · 2023-05-15 13:52:53 +05:30 · 2023-05-15 12:23:47 +05:30 · 2023-05-15 12:23:14 +05:30
10 changed files with 170 additions and 19 deletions
--- a/appUser.db
+++ b/appUser.db
--- a/data/appUser.db
+++ b/data/appUser.db
--- a/mydatabase.db
+++ b/mydatabase.db
--- a/package.json
+++ b/package.json
@@ -12,11 +12,13 @@
    "@types/node": "18.16.1",
    "@types/react": "18.2.0",
    "@types/react-dom": "18.2.1",
+    "argon2": "^0.30.3",
    "autoprefixer": "10.4.14",
    "csv-parser": "^3.0.0",
    "eslint": "8.39.0",
    "eslint-config-next": "13.3.1",
    "formidable": "^2.1.1",
+    "jsonwebtoken": "^9.0.0",
    "next": "13.3.1",
    "postcss": "8.4.23",
    "react": "18.2.0",
--- a/src/pages/add-user-form.jsx
+++ b/src/pages/add-user-form.jsx
@@ -16,14 +16,14 @@ export default function addUserForm() {
    {lang: "Bengali", value: false},
    {lang: "English", value: false},
    {lang: "Hindi", value: false},
-    {lang: "telegu", value: false},
+    {lang: "Telegu", value: false},
    {lang: "Punjabi", value: false},
-    {lang: "malayalam", value: false},
-    {lang: "tamil", value: false},
-    {lang: "kannada", value: false},
-    {lang: "gujrati", value: false},
+    {lang: "Malayalam", value: false},
+    {lang: "Tamil", value: false},
+    {lang: "Kannada", value: false},
+    {lang: "Gujrati", value: false},
  ])
-  console.log(allLanguage.value)
+  // console.log(allLanguage)
  const [currentType, setCurrentType] = useState(typeParent)
  const [countryValue, setCountryValue] = useState('')
  const options = useMemo(() => countryList().getData(), [])
@@ -37,7 +37,7 @@ export default function addUserForm() {
    setAllCities([])
    fetch(`https://api.siliconpin.com/v3/list/country/city/?country=${countryValue.value}&state=${stateCode.value}`).then(res => res.json())
      .then(data => {
-        console.log("handleSelectAllStates:", data, options)
+        // console.log("handleSelectAllStates:", data, options)
        let newData = data && data.length > 0 && data.map(n => {
          return {
            label: n.name,
@@ -86,18 +86,19 @@ export default function addUserForm() {

  const handleFormsubmit = async (event) => {
    event.preventDefault()
+    console.log(event.target.lang.checked)
    const data = {
      "status": "published",
      type: event.target.type.value,
      uname: event.target.uname.value,
      country: event.target.country.value,
-      state: event.target.state.value,
-      city: event.target.city.value,
+      state: event.target.state.value ? event.target.state.value:"",
+      city: event.target.city.value ? event.target.city.value:"",
      phone: event.target.phone.value,
      email: event.target.email.value,
      school: event.target.schoolID.value,
      klas: event.target.klas.value,
-      lang: event.target.lang.value,
+      lang: allLanguage,
      start_month: event.target.start_month.value,
      start_date: event.target.start_date.value,
      end_date: event.target.end_date.value,
@@ -117,14 +118,14 @@ export default function addUserForm() {
    }
    const response = await fetch(endpoint, options)
    const result = await response.json()
-    console.log(result)
+    // console.log(result)
    // alert(`Is this your full name: ${result}`)
  }
  const handleOnLanguageChange = (e, v) => {
    let idx = allLanguage.findIndex(o => o.lang === e.target.value);
    let newAllLang = [...allLanguage]
    newAllLang[idx].value = true
-
+    // console.log(newAllLang)

    if ([typeParent, "teacher"].includes(currentType)) {
      let counter = 0
@@ -147,7 +148,10 @@ export default function addUserForm() {
      newAllLang[idx].value = false
      newAllLang[idx].disabled = false
    })
-    setLanguage(newAllLang)
+    const { name, checked } = e.target;
+    setLanguage({ ...allLanguage, [name]: checked });
+
+    // setLanguage(newAllLang)
    setCurrentType(e.target.value)
  }
  return (
@@ -218,7 +222,7 @@ export default function addUserForm() {
                <label htmlFor="" className='text-xl font-bold'>School name</label>
                <select name="schoolID" onChange={individual}
                        className='bg-white border-2 border-[#FE4501] p-2 rounded-md focus:outline-none focus:border-2 focus:border-[#F2B705]'>
-                  <option value="individual"> individual</option>
+                  <option value="0"> individual</option>
                  {school && school.data.map(data =>
                    <option value={data.id} key={data.id}>{data.name}</option>
                  )}
@@ -313,6 +317,16 @@ export default function addUserForm() {
                  <div className='flex flex-col w-full pt-4'>
                    <label htmlFor="lang" className='text-xl font-bold'>Language</label>
                    <div className='grid grid-cols-3 md:grid-cols-4 lg:grid-cols-5 gap-y-2 pt-2'>
+                    {/* <label className='cursor-pointer' htmlFor="Assamese"> Assamese </label> &nbsp; <input type="checkbox" name="lang" value="Assamese" className='check-box'/> <br />
+                    <label className='cursor-pointer' htmlFor="Bengali"> Bengali </label> &nbsp; <input type="checkbox" name="lang" value="Bengali" className='check-box'/> <br />
+                    <label className='cursor-pointer' htmlFor="English"> English </label> &nbsp; <input type="checkbox" name="lang" value="English" className='check-box'/> <br />
+                    <label className='cursor-pointer' htmlFor="Hindi"> Hindi </label> &nbsp; <input type="checkbox" name="lang" value="Hindi" className='check-box'/> <br />
+                    <label className='cursor-pointer' htmlFor="Telegu"> Telegu </label> &nbsp; <input type="checkbox" name="lang" value="Telegu" className='check-box'/> <br />
+                    <label className='cursor-pointer' htmlFor="Punjabi"> Punjabi </label> &nbsp; <input type="checkbox" name="lang" value="Punjabi" className='check-box'/> <br />
+                    <label className='cursor-pointer' htmlFor="Malayalam"> Malayalam </label> &nbsp; <input type="checkbox" name="lang" value="Malayalam" className='check-box'/> <br />
+                    <label className='cursor-pointer' htmlFor="Tamil"> Tamil </label> &nbsp; <input type="checkbox" name="lang" value="Tamil" className='check-box'/> <br />
+                    <label className='cursor-pointer' htmlFor="Kannada"> Kannada </label> &nbsp; <input type="checkbox" name="lang" value="Kannada" className='check-box'/> <br />
+                    <label className='cursor-pointer' htmlFor="Gujrati"> Gujrati </label> &nbsp; <input type="checkbox" name="lang" value="Gujrati" className='check-box'/> <br /> */}
                      {allLanguage && allLanguage.length && allLanguage.map(n => {
                        return (
                          <div key={n.lang} className=''>
--- a/src/pages/api/addUsers.js
+++ b/src/pages/api/addUsers.js
@@ -39,5 +39,5 @@ export default function handler(req, res) {
  db.close();


-  res.status(200).json({ name: 'John Doe' });
+  res.status(200).json({ msg: 'ok' });
 }
--- a/src/pages/api/login.js
+++ b/src/pages/api/login.js
@@ -0,0 +1,72 @@
+export default function handler(req, res) {
+    // const sqlite3 = require('sqlite3').verbose();
+  
+    // console.log(req.body)
+const sqlite3 = require('sqlite3');
+const argon2 = require('argon2');
+const jwt = require('jsonwebtoken');
+
+// Connect to the SQLite database
+const db = new sqlite3.Database('data/appUser.db');
+
+// Fetch the user record
+const username = req.body.email;
+// console.log(username)
+const sql = 'SELECT * FROM user WHERE email = ?';
+db.get(sql, [username], async (err, userRecord) => {
+  if (err) {
+    console.error(err);
+    return;
+  }
+
+  if (userRecord) {
+    const storedHash = userRecord.pass;
+    console.log(storedHash)
+    const providedPassword = req.body.password;
+
+    try {
+      // Verify the provided password with the stored hash
+      const isPasswordValid = await argon2.verify(storedHash, providedPassword);
+
+      if (isPasswordValid) {
+        // Passwords match, generate JWT token
+        const secretKey = process.env.TOKEN_HEADER_KEY;
+        const tokenPayload = { 
+                                email:userRecord.email,
+                                role: userRecord.type,
+                                iat: Math.floor(Date.now() / 1000),
+                                exp: Math.floor(Date.now() / 1000) + 3600*24*7,
+                                
+                            };
+        const jwtToken = jwt.sign(tokenPayload, secretKey, { algorithm: 'HS256' });
+        const jwtTokenData ={ 
+            data:{
+                access_token:jwtToken,
+                role: userRecord.type,
+                email: userRecord.email,
+                expires: 3600*24*7,
+            
+            }
+        };
+
+        // Return the JWT token
+        res.status(200).json(jwtTokenData);
+        console.log(jwtToken);
+      } else {
+        console.log('Invalid password');
+        res.status(400).json({err:'400P'});
+      }
+    } catch (err) {
+      console.error(err);
+    }
+  } else {
+    res.status(400).json({err:'400U'});
+    console.log('User not found');
+  }
+
+  // Close the database connection
+  db.close();
+});
+
+// res.status(200).json({ name: 'John Doe' });
+}
--- a/src/pages/user-list.jsx
+++ b/src/pages/user-list.jsx
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -18,6 +18,6 @@
      "@/*": ["./src/*"]
    }
  },
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "src/pages/add-school-form.jsx", "src/pages/add-school-form.jsx", "src/pages/add-user-form.jsx", "src/pages/test/file-upload.jsx"],
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "src/pages/add-school-form.jsx", "src/pages/add-school-form.jsx", "src/pages/add-user-form.jsx", "src/pages/test/file-upload.jsx", "src/pages/user-list.jsx"],
  "exclude": ["node_modules"]
 }
--- a/yarn.lock
+++ b/yarn.lock
@@ -256,7 +256,7 @@
    "@jridgewell/resolve-uri" "3.1.0"
    "@jridgewell/sourcemap-codec" "1.4.14"

-"@mapbox/node-pre-gyp@^1.0.0":
+"@mapbox/node-pre-gyp@^1.0.0", "@mapbox/node-pre-gyp@^1.0.10":
  version "1.0.10"
  resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz#8e6735ccebbb1581e5a7e652244cadc8a844d03c"
  integrity sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA==
@@ -365,6 +365,11 @@
    mkdirp "^1.0.4"
    rimraf "^3.0.2"

+"@phc/format@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@phc/format/-/format-1.0.0.tgz#b5627003b3216dc4362125b13f48a4daa76680e4"
+  integrity sha512-m7X9U6BG2+J+R1lSOdCiITLLrxm+cWlNI3HUFA92oLO77ObGNzaKdh8pMLqdZcshtkKuV84olNNXDfMc4FezBQ==
+
 "@pkgr/utils@^2.3.1":
  version "2.3.1"
  resolved "https://registry.yarnpkg.com/@pkgr/utils/-/utils-2.3.1.tgz#0a9b06ffddee364d6642b3cd562ca76f55b34a03"
@@ -593,6 +598,15 @@ arg@^5.0.2:
  resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c"
  integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==

+argon2@^0.30.3:
+  version "0.30.3"
+  resolved "https://registry.yarnpkg.com/argon2/-/argon2-0.30.3.tgz#795ca57acad76fc67dd5695732662a03018b84ed"
+  integrity sha512-DoH/kv8c9127ueJSBxAVJXinW9+EuPA3EMUxoV2sAY1qDE5H9BjTyVF/aD2XyHqbqUWabgBkIfcP3ZZuGhbJdg==
+  dependencies:
+    "@mapbox/node-pre-gyp" "^1.0.10"
+    "@phc/format" "^1.0.0"
+    node-addon-api "^5.0.0"
+
 argparse@^2.0.1:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
@@ -743,6 +757,11 @@ browserslist@^4.21.5:
    node-releases "^2.0.8"
    update-browserslist-db "^1.0.10"

+buffer-equal-constant-time@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
+  integrity sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==
+
 busboy@1.6.0:
  version "1.6.0"
  resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893"
@@ -1062,6 +1081,13 @@ dom-helpers@^5.0.1:
    "@babel/runtime" "^7.8.7"
    csstype "^3.0.2"

+ecdsa-sig-formatter@1.0.11:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz#ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf"
+  integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==
+  dependencies:
+    safe-buffer "^5.0.1"
+
 electron-to-chromium@^1.4.284:
  version "1.4.372"
  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.372.tgz#7888ac92ccb9556627c3a37eba3b89ee5ac345f8"
@@ -2111,6 +2137,16 @@ json5@^1.0.2:
  dependencies:
    minimist "^1.2.0"

+jsonwebtoken@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz#d0faf9ba1cc3a56255fe49c0961a67e520c1926d"
+  integrity sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==
+  dependencies:
+    jws "^3.2.2"
+    lodash "^4.17.21"
+    ms "^2.1.1"
+    semver "^7.3.8"
+
 "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.3.3:
  version "3.3.3"
  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz#76b3e6e6cece5c69d49a5792c3d01bd1a0cdc7ea"
@@ -2119,6 +2155,23 @@ json5@^1.0.2:
    array-includes "^3.1.5"
    object.assign "^4.1.3"

+jwa@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
+  integrity sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==
+  dependencies:
+    buffer-equal-constant-time "1.0.1"
+    ecdsa-sig-formatter "1.0.11"
+    safe-buffer "^5.0.1"
+
+jws@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304"
+  integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==
+  dependencies:
+    jwa "^1.4.1"
+    safe-buffer "^5.0.1"
+
 language-subtag-registry@~0.3.2:
  version "0.3.22"
  resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz#2e1500861b2e457eba7e7ae86877cbd08fa1fd1d"
@@ -2166,6 +2219,11 @@ lodash.merge@^4.6.2:
  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==

+lodash@^4.17.21:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+
 loose-envify@^1.1.0, loose-envify@^1.4.0:
  version "1.4.0"
  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
@@ -2364,6 +2422,11 @@ node-addon-api@^4.2.0:
  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f"
  integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==

+node-addon-api@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-5.1.0.tgz#49da1ca055e109a23d537e9de43c09cca21eb762"
+  integrity sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==
+
 node-fetch@^2.6.7:
  version "2.6.11"
  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.11.tgz#cde7fc71deef3131ef80a738919f999e6edfff25"
@@ -2864,7 +2927,7 @@ run-parallel@^1.1.9:
  dependencies:
    queue-microtask "^1.2.2"

-safe-buffer@~5.2.0:
+safe-buffer@^5.0.1, safe-buffer@~5.2.0:
  version "5.2.1"
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -2895,7 +2958,7 @@ semver@^6.0.0, semver@^6.3.0:
  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==

-semver@^7.3.5:
+semver@^7.3.5, semver@^7.3.8:
  version "7.5.1"
  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.1.tgz#c90c4d631cf74720e46b21c1d37ea07edfab91ec"
  integrity sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==
Author	SHA1	Message	Date
Kar	3246d7c970	login	2023-05-15 20:53:19 +05:30
Kar	a538f23124	login	2023-05-15 17:57:16 +05:30
Kar	02874ff761	tsx	2023-05-15 14:27:10 +05:30
Kar	c5a98bd991	langValueSolved	2023-05-15 13:52:53 +05:30
Kar	cd27f080d6	i	2023-05-15 12:23:47 +05:30
Kar	326d16f312	s1	2023-05-15 12:23:14 +05:30