bubble/todo-app
1
0
Fork 0
mirror of https://github.com/sergeyyarkov/todo-app.git synced 2026-10-11 10:29:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

render upd

Browse Source
This commit is contained in:
Sergey Yarkov 2020-06-12 21:15:42 +03:00
parent 7f5d9d260f
commit 792d013c08
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/components/Modals/Todo/CreateTodoModal.js
View File

@ -20,7 +20,7 @@ const CreateTodoModal = ({ isModalOpen, handleCloseModal }) => {
const data = { const data = {
title: elements.title.value, title: elements.title.value,
description: elements.description.value, description: elements.description.value,
category: elements.category.value, categoryId: elements.category.value,
deadline: elements.deadline.value deadline: elements.deadline.value
} }
handleCloseModal() handleCloseModal()
@ -87,7 +87,7 @@ const CreateTodoModal = ({ isModalOpen, handleCloseModal }) => {
onChange={handleFieldChange} onChange={handleFieldChange}
label="Категория" label="Категория"
> >
{categories.map((category, i) => <MenuItem key={i} value={category._id.$oid}>{category._id.$oid}</MenuItem>)} {categories.map((category, i) => <MenuItem key={i} value={category._id.$oid}>{category.title}</MenuItem>)}
</Select> </Select>
</FormControl> </FormControl>
<TextField <TextField

6
client/src/components/Modals/Todo/UpdateTodoModal.js
View File

@ -13,11 +13,11 @@ const UpdateTodoModal = ({ isModalOpen, handleCloseModal, selectedTodo, setSelec
const data = { const data = {
title: elements.title.value, title: elements.title.value,
description: elements.description.value, description: elements.description.value,
category: elements.category.value, categoryId: elements.category.value,
deadline: elements.deadline.value deadline: elements.deadline.value
} }
handleCloseModal() handleCloseModal()
console.log('Request on update:', data) console.log('Request on update todo:', data)
} }
const handleFieldChange = e => { const handleFieldChange = e => {
@ -75,7 +75,7 @@ const UpdateTodoModal = ({ isModalOpen, handleCloseModal, selectedTodo, setSelec
onChange={handleFieldChange} onChange={handleFieldChange}
label="Категория" label="Категория"
> >
{categories.map((category, i) => <MenuItem key={i} value={category._id.$oid}>{category._id.$oid}</MenuItem>)} {categories.map((category, i) => <MenuItem key={i} value={category._id.$oid}>{category.title}</MenuItem>)}
</Select> </Select>
</FormControl> </FormControl>
<TextField <TextField

5
client/src/components/Todos/Todos.js
View File

@ -7,6 +7,9 @@ import DeleteIcon from '@material-ui/icons/Delete'
import AlarmIcon from '@material-ui/icons/Alarm'; import AlarmIcon from '@material-ui/icons/Alarm';
import EditIcon from '@material-ui/icons/Edit'; import EditIcon from '@material-ui/icons/Edit';
import categories from '../../db/categories.json'
const useStyles = makeStyles((theme) => ({ const useStyles = makeStyles((theme) => ({
alarmIcon: { alarmIcon: {
marginRight: 10 marginRight: 10
@ -62,7 +65,7 @@ const Todos = ({ data, fromTrashContainer }) => {
<Card> <Card>
<CardContent> <CardContent>
<Typography className={classes.cardCategoryHeading} color="textSecondary" gutterBottom> <Typography className={classes.cardCategoryHeading} color="textSecondary" gutterBottom>
CategoryId: {todo.categoryId} {categories.find(category => category._id.$oid === todo.categoryId).title}
<span className={classes.cardAlarm}> <span className={classes.cardAlarm}>
<AlarmIcon className={classes.alarmIcon} color='action' /> <AlarmIcon className={classes.alarmIcon} color='action' />
{todo.deadline} {todo.deadline}

8
client/src/db/categories.json
View File

@ -22,12 +22,4 @@
"description": "some description", "description": "some description",
"updatedAt": "2020-04-04", "updatedAt": "2020-04-04",
"createdAt": "2020-01-01" "createdAt": "2020-01-01"
},{
"_id": {
"$oid": "5ede83c823d3141d80145f2b"
},
"title": "upd category title",
"description": "upd category description",
"createdAt": "2020-06-08T18:30:32.811Z",
"updatedAt": "2020-06-08T18:32:34.962Z"
}] }]