From f42bbd4dcd878bdde9aafd504d5abf78c9ea955a Mon Sep 17 00:00:00 2001
From: kothadiyasagar <sagarkothadiya98@gmail.com>
Date: Sat, 23 Jul 2022 20:21:23 +0530
Subject: [PATCH 1/3] d

---
 client/src/App.js                      | 8 ++++++--
 client/src/pages/Teams/Teamdisplay.jsx | 4 ++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/client/src/App.js b/client/src/App.js
index fb9c722..ca83171 100644
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -7,7 +7,8 @@ import Header from './components/Hedear/Header';
 import Usecase from './pages/UsecasePage/Usecase';
 import { PricingPage } from './pages/Pricing_Page/PricingPage';
 import Signup from "./pages/Signup/Signup.jsx"
-
+import Teamdisplay from './pages/Teams/Teamdisplay';
+import AddTeam from './pages/Teams/AddTeam.jsx'
 function App() {
   return (
     <div className='App'>
@@ -17,7 +18,10 @@ function App() {
         <Route path='/signin' element={<Signin />} />
         <Route path='/signup' element={<Signup />} />
         <Route path='/usecase' element={<Usecase />} />
-        <Route path='/pricing' element={<PricingPage />} />
+        <Route path='/pricing' element={<PricingPage />} /> 
+        <Route path="/team"  element = {<Teamdisplay/>} />
+        <Route path ="/team/:id" element ={<AddTeam/>} />
+
       </Routes>
 
       <Footer />
diff --git a/client/src/pages/Teams/Teamdisplay.jsx b/client/src/pages/Teams/Teamdisplay.jsx
index 18c95b1..23c738d 100644
--- a/client/src/pages/Teams/Teamdisplay.jsx
+++ b/client/src/pages/Teams/Teamdisplay.jsx
@@ -15,8 +15,12 @@ import {
   Tbody,
 } from "@chakra-ui/react";
 import { AddIcon, ArrowUpIcon, ExternalLinkIcon, EditIcon } from "@chakra-ui/icons";
+import { useNavigate } from "react-router";
+
+
 
 const Teamdisplay = () => {
+  const Nevigete = useNavigate()
   return (
     <Box width="85%" p="5">
       <Flex>

From f8fd21d242c3d72f1e5cb7675073ea5fa4196f47 Mon Sep 17 00:00:00 2001
From: kothadiyasagar <sagarkothadiya98@gmail.com>
Date: Sat, 23 Jul 2022 21:20:45 +0530
Subject: [PATCH 2/3] d

---
 client/src/App.js                      |  6 ++--
 client/src/pages/Teams/AddTeam.jsx     |  4 +++
 client/src/pages/Teams/Teamdisplay.jsx | 16 +++++++++--
 server/project/route/clientsRoute.js   | 38 ++++++++++++++++++++++++++
 server/project/route/teamRoute.js      |  2 ++
 5 files changed, 61 insertions(+), 5 deletions(-)

diff --git a/client/src/App.js b/client/src/App.js
index ca83171..4b4d697 100644
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -12,7 +12,7 @@ import AddTeam from './pages/Teams/AddTeam.jsx'
 function App() {
   return (
     <div className='App'>
-      <Header />
+      {/* <Header /> */}
       <Routes>
         <Route path='/' element={<Homepage />} />
         <Route path='/signin' element={<Signin />} />
@@ -20,11 +20,11 @@ function App() {
         <Route path='/usecase' element={<Usecase />} />
         <Route path='/pricing' element={<PricingPage />} /> 
         <Route path="/team"  element = {<Teamdisplay/>} />
-        <Route path ="/team/:id" element ={<AddTeam/>} />
+        <Route path ="/team/add" element ={<AddTeam/>} />
 
       </Routes>
 
-      <Footer />
+      {/* <Footer /> */}
     </div>
   );
 }
diff --git a/client/src/pages/Teams/AddTeam.jsx b/client/src/pages/Teams/AddTeam.jsx
index f9c841f..893f598 100644
--- a/client/src/pages/Teams/AddTeam.jsx
+++ b/client/src/pages/Teams/AddTeam.jsx
@@ -7,6 +7,9 @@ import {
 
 const AddTeam = () => {
   return (
+
+    <>
+    
     <Box w="85%" border="1px solid">
       <Box w="48%" m="auto">
         <Heading fontWeight="500" mt="30">
@@ -27,6 +30,7 @@ const AddTeam = () => {
         </FormControl>
       </Box>
     </Box>
+    </>
   );
 };
 
diff --git a/client/src/pages/Teams/Teamdisplay.jsx b/client/src/pages/Teams/Teamdisplay.jsx
index 23c738d..5154f19 100644
--- a/client/src/pages/Teams/Teamdisplay.jsx
+++ b/client/src/pages/Teams/Teamdisplay.jsx
@@ -16,19 +16,27 @@ import {
 } from "@chakra-ui/react";
 import { AddIcon, ArrowUpIcon, ExternalLinkIcon, EditIcon } from "@chakra-ui/icons";
 import { useNavigate } from "react-router";
+import Sidebar from "../sidebar/Sidebar";
 
 
 
 const Teamdisplay = () => {
   const Nevigete = useNavigate()
   return (
-    <Box width="85%" p="5">
+    <>
+    <div  style={{display:"flex",justifyContent:"space-between"}}>
+ <div>
+  {<Sidebar/>}
+ </div>
+ <div  style={{marginTop:"0px"}}>
+    
+ <Box width="100%" p="" m="15px  200px 0px  0px">
       <Flex>
         <Heading size="xl" fontWeight="500">
           Team members
         </Heading>
         <Spacer />
-        <Button colorScheme="blue" leftIcon={<AddIcon />}>
+        <Button colorScheme="blue"  onClick={()=>{Nevigete("/team/add")}} leftIcon={<AddIcon />}>
           New Team Member
         </Button>
       </Flex>
@@ -65,6 +73,10 @@ const Teamdisplay = () => {
         </Table>
       </TableContainer>
     </Box>
+  </div>
+    </div>
+
+    </>
   );
 };
 
diff --git a/server/project/route/clientsRoute.js b/server/project/route/clientsRoute.js
index 8a7f7e4..527f289 100644
--- a/server/project/route/clientsRoute.js
+++ b/server/project/route/clientsRoute.js
@@ -13,6 +13,20 @@ clientRouter.post("/clientpost",async(req,res)=>{
     await  client.save()
     res.send(" client are add")
 
+})
+clientRouter.get('/:id',async(req,res)=>{
+    res.setHeader("content-type","application/json")
+         console.log(req.params.id)
+    try {
+  
+        const data =  await clientModel.findOne({_id:req.params.id})
+        console.log(data)
+         return res.status(200).json(data)
+       }catch(error){
+         res.status(404).json(error) 
+       
+     }
+         
 })
 clientRouter.get("/clientdata", async(req,res)=>{
     res.setHeader("content-type","application/json")
@@ -26,5 +40,29 @@ clientRouter.get("/clientdata", async(req,res)=>{
        
      }
 })
+clientRouter.put("/:id", async(req,res)=>{
+    res.setHeader("content-type","application/json")
+    const user = req.body
+     console.log("1",user)
+    const edditUser = new clientModel(user)
+    try {
+         
+          await User.updateOne({_id:req.params.id},edditUser)
+          console.log("1",edditUser)
+          return res.status(201).json(edditUser)
+    } catch(error){
+        res.status(409).json(error) 
+    } 
+})
+ routclientRouter.delete("/:id", async(req,res)=>{
+    res.setHeader("content-type","application/json")
+     try {
+         await clientModel.deleteOne({_id:req.params.id})
+         return res.status(200).json("delete success")
+     } catch(error){
+         res.status(409).json(error) 
+     }
+ })
+
 
 module.exports = clientRouter
\ No newline at end of file
diff --git a/server/project/route/teamRoute.js b/server/project/route/teamRoute.js
index 77db4d8..a30e3c8 100644
--- a/server/project/route/teamRoute.js
+++ b/server/project/route/teamRoute.js
@@ -24,4 +24,6 @@ Team.post("/teamMemberpost" , async(req,res)=>{
      }
 
  })
+
+ 
 module.exports =Team
\ No newline at end of file

From 27ba109d835aeba3f07707dbc7c14e7c6a720411 Mon Sep 17 00:00:00 2001
From: kothadiyasagar <sagarkothadiya98@gmail.com>
Date: Sat, 23 Jul 2022 21:34:31 +0530
Subject: [PATCH 3/3] team

---
 server/project/route/teamRoute.js | 39 +++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/server/project/route/teamRoute.js b/server/project/route/teamRoute.js
index a30e3c8..f8f7897 100644
--- a/server/project/route/teamRoute.js
+++ b/server/project/route/teamRoute.js
@@ -26,4 +26,43 @@ Team.post("/teamMemberpost" , async(req,res)=>{
  })
 
  
+
+Team.get('/:id',async(req,res)=>{
+    res.setHeader("content-type","application/json")
+         console.log(req.params.id)
+    try {
+  
+        const data =  await TeamMeamber.findOne({_id:req.params.id})
+        console.log(data)
+         return res.status(200).json(data)
+       }catch(error){
+         res.status(404).json(error) 
+       
+     }
+         
+})
+Team.put("/:id", async(req,res)=>{
+    res.setHeader("content-type","application/json")
+    const user = req.body
+     console.log("1",user)
+    const edditUser = new TeamMeamber(user)
+    try {
+         
+          await TeamMeamber.updateOne({_id:req.params.id},edditUser)
+          console.log("1",edditUser)
+          return res.status(201).json(edditUser)
+    } catch(error){
+        res.status(409).json(error) 
+    } 
+})
+ Team.delete("/:id", async(req,res)=>{
+    res.setHeader("content-type","application/json")
+     try {
+         await TeamMeamber.deleteOne({_id:req.params.id})
+         return res.status(200).json("delete success")
+     } catch(error){
+         res.status(409).json(error) 
+     }
+ })
+
 module.exports =Team
\ No newline at end of file