Merge pull request #145 from Red-Stream-Y3/main

main to production
Red-Stream-Y3 · May 17, 2023 · 5a9a8c0 · 5a9a8c0
2 parents 33a1751 + 7712a4f
commit 5a9a8c0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/FrontEnd/src/pages/knowledgebase/CreateCrop.jsx b/FrontEnd/src/pages/knowledgebase/CreateCrop.jsx
@@ -1,8 +1,11 @@
 import { useState, useEffect } from 'react'
 import { createCrop } from '../../api/knowlegdebase'
+import { useNavigate } from 'react-router-dom'
 
 const CreateCrop = () => {
 
+  const navigate = useNavigate()
+
   const user = JSON.parse(localStorage.getItem('userInfo'))
   const userId = user._id
 
@@ -47,6 +50,7 @@ const CreateCrop = () => {
     try {
       const newCrop = await createCrop(crop, user.token)
       alert('Crop Created Successfully')
+      navigate('/contributor/dashboard')
     } catch (error) {
       console.log('error', error)
       alert('Crop Creation Failed')

diff --git a/FrontEnd/src/pages/knowledgebase/CreateDisease.jsx b/FrontEnd/src/pages/knowledgebase/CreateDisease.jsx
@@ -1,9 +1,12 @@
 import { useState, useEffect } from 'react'
 import { createDisease } from '../../api/knowlegdebase'
 import { AiFillCloseCircle } from 'react-icons/ai'
+import { useNavigate } from 'react-router-dom'
 
 const CreateDisease = () => {
 
+  const navigate = useNavigate()
+
   const user = JSON.parse(localStorage.getItem('userInfo'))
   const userId = user._id
 
@@ -31,8 +34,11 @@ const CreateDisease = () => {
     e.preventDefault()
     try {
       const data = await createDisease(disease, user.token)
+      alert('Disease created successfully')
+      navigate('/contributor/dashboard')
     } catch (error) {
       console.log(error)
+      alert('Disease creation failed')
     }
   }
 
@@ -93,7 +99,6 @@ const CreateDisease = () => {
       diseaseImage: [],
     })
   }
-
 
   return (
     <div>

diff --git a/FrontEnd/src/pages/knowledgebase/UpdateCrop.jsx b/FrontEnd/src/pages/knowledgebase/UpdateCrop.jsx
@@ -1,9 +1,10 @@
 import { useState, useEffect } from "react"
-import { Navigate, useParams } from "react-router-dom"
+import { useNavigate, useParams } from "react-router-dom"
 import { updateCrop, getCropById } from "../../api/knowlegdebase"
 import { Loader } from "../../components"
 
 const UpdateCrop = () => {
+  const navigate = useNavigate()
   const { id } = useParams()
   const user = JSON.parse(localStorage.getItem('userInfo'))
   const [crop, setCrop] = useState({
@@ -56,7 +57,7 @@ const UpdateCrop = () => {
     const updated = await updateCrop(id, crop, user.token)
     if (updated) {
       alert('Crop updated successfully')
-      return <Navigate to="/contributor/dashboard" />
+      navigate('/contributor/dashboard')
     } else {
       alert('Crop update failed')
     }

diff --git a/FrontEnd/src/pages/knowledgebase/UpdateDisease.jsx b/FrontEnd/src/pages/knowledgebase/UpdateDisease.jsx
@@ -1,11 +1,13 @@
 import { useState, useEffect } from "react"
-import { Navigate, useParams } from "react-router-dom"
+import { useNavigate, useParams } from "react-router-dom"
 import { updateDisease, getDiseaseById } from "../../api/knowlegdebase"
 import { AiFillCloseCircle } from "react-icons/ai"
 
 
 const UpdateDisease = () => {
 
+  const navigate = useNavigate()
+
   const { id } = useParams()
   const user = JSON.parse(localStorage.getItem('userInfo'))
 
@@ -41,7 +43,7 @@ const UpdateDisease = () => {
     const updated = await updateDisease(id, disease, user.token)
     if (updated) {
       alert('Disease updated successfully')
-      return <Navigate to="/contributor/dashboard" />
+      navigate('/contributor/dashboard')
     }
     else {
       alert('Disease update failed')