Skip to content

Commit

Permalink
tweak to individual pages
Browse files Browse the repository at this point in the history
  • Loading branch information
Fraju-pc committed Jul 31, 2023
1 parent 3c9952b commit 22bc545
Show file tree
Hide file tree
Showing 5 changed files with 146 additions and 133 deletions.
246 changes: 119 additions & 127 deletions Week-16-React_Router_and_React_Bootstrap/src/pages/Admin/Admin.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@ import Form from "react-bootstrap/Form";
import Container from "react-bootstrap/Container";
import Row from "react-bootstrap/Row";
import Col from "react-bootstrap/Col";
//import Table from 'react-bootstrap/Table';
import React, { useState } from "react";
//import DisplayTableRow from "../../components/DisplayTableRow";
//import filterByName from "../../components/filterByName";
import Atable from "../../components/Atable";
import Btable from "../../components/Btable";
import Ctable from "../../components/Ctable";
Expand All @@ -22,76 +19,72 @@ export default function Admin({ chores, getChores, Chores_Api_URL }) {
const [udate, setUdate] = useState("");

const addTask = async (e) => {
e.preventDefault()
e.preventDefault();
try {
const response = await fetch(Chores_Api_URL, {
method: 'POST',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify({
name: user,
task: task,
date: date
})
});
const data = await response.json();
//logic when the Post is successful
console.log(data);
getChores();
setUser('');
setTask('');
setDate('');
} catch(error) {
//logic for when there is an error
console.log(error)
}
const response = await fetch(Chores_Api_URL, {
method: "POST",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify({
name: user,
task: task,
date: date,
}),
});
const data = await response.json();
//logic when the Post is successful
console.log(data);
getChores();
setUser("");
setTask("");
setDate("");
} catch (error) {
//logic for when there is an error
console.log(error);
}
const deleteTask = async (e, id) => {
e.preventDefault()
try {
const response = await fetch(`${Chores_Api_URL}/${id}`, {
method: 'DELETE'
});
const data = await response.json();
//logic when the delete is successful
console.log(data);
getChores();

} catch(error) {
//logic for when there is an error
console.log(error)
}
}
const updatedTask = async (e, id) => {
e.preventDefault()
try {
const response = await fetch(`${Chores_Api_URL}/${id}`, {
method: 'PUT',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify({
name: uuser,
task: utask,
date: udate
})
});
const data = await response.json();
//logic when the Put is successful
console.log(data);
getChores();
setUuser('');
setUtask('');
setUdate('');

} catch(error) {
//logic for when there is an error
console.log(error)
}
}


};
const deleteTask = async (e, id) => {
e.preventDefault();
try {
const response = await fetch(`${Chores_Api_URL}/${id}`, {
method: "DELETE",
});
const data = await response.json();
//logic when the delete is successful
console.log(data);
getChores();
} catch (error) {
//logic for when there is an error
console.log(error);
}
};
const updatedTask = async (e, id) => {
e.preventDefault();
try {
const response = await fetch(`${Chores_Api_URL}/${id}`, {
method: "PUT",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify({
name: uuser,
task: utask,
date: udate,
}),
});
const data = await response.json();
//logic when the Put is successful
console.log(data);
getChores();
setUuser("");
setUtask("");
setUdate("");
} catch (error) {
//logic for when there is an error
console.log(error);
}
};

return (
<Container>
Expand Down Expand Up @@ -139,70 +132,69 @@ export default function Admin({ chores, getChores, Chores_Api_URL }) {
<Col xs={1} md={3}></Col>
</Row>
<Row className="m-4 p-3">
<Col>
<Col className="m-3">
<div className="round-corners">
<Atable
chores={chores}
deleteTask={deleteTask}
uuser={uuser}
utask={utask}
udate={udate}
setUuser={setUuser}
setUtask={setUtask}
setUdate={setUdate}
updatedTask={updatedTask}
/>
</div>
<Atable
chores={chores}
deleteTask={deleteTask}
uuser={uuser}
utask={utask}
udate={udate}
setUuser={setUuser}
setUtask={setUtask}
setUdate={setUdate}
updatedTask={updatedTask}
/>
</div>
</Col>
<Col >
<div className="round-corners">
<Btable
chores={chores}
deleteTask={deleteTask}
uuser={uuser}
utask={utask}
udate={udate}
setUuser={setUuser}
setUtask={setUtask}
setUdate={setUdate}
updatedTask={updatedTask}
/>
</div>
<Col className="m-3">
<div className="round-corners">
<Btable
chores={chores}
deleteTask={deleteTask}
uuser={uuser}
utask={utask}
udate={udate}
setUuser={setUuser}
setUtask={setUtask}
setUdate={setUdate}
updatedTask={updatedTask}
/>
</div>
</Col>
</Row>
<Row className="m-4 p-3">
<Col>
<div className="round-corners">
<Ctable
chores={chores}
deleteTask={deleteTask}
uuser={uuser}
utask={utask}
udate={udate}
setUuser={setUuser}
setUtask={setUtask}
setUdate={setUdate}
updatedTask={updatedTask}
/>
</div>
<Col className="m-3">
<div className="round-corners">
<Ctable
chores={chores}
deleteTask={deleteTask}
uuser={uuser}
utask={utask}
udate={udate}
setUuser={setUuser}
setUtask={setUtask}
setUdate={setUdate}
updatedTask={updatedTask}
/>
</div>
</Col>
<Col>
<div className="round-corners">
<Dtable
chores={chores}
deleteTask={deleteTask}
uuser={uuser}
utask={utask}
udate={udate}
setUuser={setUuser}
setUtask={setUtask}
setUdate={setUdate}
updatedTask={updatedTask}
/>
</div>
<Col className="m-3">
<div className="round-corners">
<Dtable
chores={chores}
deleteTask={deleteTask}
uuser={uuser}
utask={utask}
udate={udate}
setUuser={setUuser}
setUtask={setUtask}
setUdate={setUdate}
updatedTask={updatedTask}
/>
</div>
</Col>
</Row>

</Container>
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,17 @@ import Container from "react-bootstrap/Container";
import Row from "react-bootstrap/Row";
import filterByName from '../../components/filterByName';
import UserTableRow from '../../components/UserTableRow';
import { Col } from 'react-bootstrap';


export default function ChildA({chores}) {
return (
<Container>
<Row>
<Col className="p-3 m-4" id="form-area"><h1 id="text-header">Ayla's Tasks:</h1></Col>
<Col></Col>
<Col></Col>
</Row>
<Row className='m-3 p-3'>
<div className='round-corners'>
<Table id="table" striped bordered hover variant="dark">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
import Table from 'react-bootstrap/Table';
import Container from "react-bootstrap/Container";
import Row from "react-bootstrap/Row";

import { Col } from 'react-bootstrap';
import filterByName from '../../components/filterByName';
import UserTableRow from '../../components/UserTableRow';


export default function ChildB({chores}) {
return (
<Container>
<Row>
<Col className="p-3 m-4" id="form-area"><h1 id="text-header">Braiden's Tasks:</h1></Col>
<Col></Col>
<Col></Col>
</Row>
<Row className='m-3 p-3'>
<Table striped bordered hover variant="dark">
<thead>
<tr>
<th>Ayla's Tasks</th>
<th>Braiden's Tasks</th>
<th>Date Assigned:</th>
<th>Task:</th>
<th>Completed?:</th>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
import Table from 'react-bootstrap/Table';
import Container from "react-bootstrap/Container";
import Row from "react-bootstrap/Row";

import { Col } from 'react-bootstrap';
import filterByName from '../../components/filterByName';
import UserTableRow from '../../components/UserTableRow';


export default function ChildC({chores}) {
return (
<Container>
<Row>
<Col className="p-3 m-4" id="form-area"><h1 id="text-header">Callan's Tasks:</h1></Col>
<Col></Col>
<Col></Col>
</Row>
<Row className='m-3 p-3'>
<Table striped bordered hover variant="dark">
<thead>
<tr>
<th>Ayla's Tasks</th>
<th>Callan's Tasks</th>
<th>Date Assigned:</th>
<th>Task:</th>
<th>Completed?:</th>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
import Table from 'react-bootstrap/Table';
import Container from "react-bootstrap/Container";
import Row from "react-bootstrap/Row";

import { Col } from 'react-bootstrap';
import filterByName from '../../components/filterByName';
import UserTableRow from '../../components/UserTableRow';


export default function ChildD({chores}) {
return (
<Container>
<Row>
<Col className="p-3 m-4" id="form-area"><h1 id="text-header">Delaney's Tasks:</h1></Col>
<Col></Col>
<Col></Col>
</Row>
<Row className='m-3 p-3'>
<Table striped bordered hover variant="dark">
<thead>
<tr>
<th>Ayla's Tasks</th>
<th>Delaney's Tasks</th>
<th>Date Assigned:</th>
<th>Task:</th>
<th>Completed?:</th>
Expand Down

0 comments on commit 22bc545

Please sign in to comment.