feature: add/edit/delete tasks

This commit is contained in:
kkzzhizhou 2021-11-28 22:47:54 +08:00
parent 876fe85f08
commit ac57825452
7 changed files with 75 additions and 48 deletions

View file

@ -30,6 +30,7 @@
}, },
"dependencies": { "dependencies": {
"@mui/icons-material": "^5.2.0", "@mui/icons-material": "^5.2.0",
"@react-navigation/native": "^6.0.6",
"i18next": "^21.5.2", "i18next": "^21.5.2",
"i18next-browser-languagedetector": "^6.1.2", "i18next-browser-languagedetector": "^6.1.2",
"node": "^16.10.0", "node": "^16.10.0",
@ -40,6 +41,7 @@
"react-hook-form": "^7.20.2", "react-hook-form": "^7.20.2",
"react-i18next": "^11.14.2", "react-i18next": "^11.14.2",
"react-markdown": "^7.1.0", "react-markdown": "^7.1.0",
"react-navigation": "^4.4.4",
"react-tabs": "^3.2.2" "react-tabs": "^3.2.2"
} }
} }

View file

@ -1,9 +1,10 @@
import * as React from "react"; import * as React from "react";
import { Notice } from "obsidian"; import { Notice } from "obsidian";
import { getStats, scoreTask, makeCronReq, costReward, addTask, deleteTask } from "./habiticaAPI" import { getStats, scoreTask, makeCronReq, costReward, addTask, deleteTask, updateTask } from "./habiticaAPI"
import Statsview from "./Components/Statsview" import Statsview from "./Components/Statsview"
import Taskview from "./Components/Taskview" import Taskview from "./Components/Taskview"
import "../i18n" import "../i18n"
import { exit } from "process";
class App extends React.Component<any, any> { class App extends React.Component<any, any> {
private _username = ""; private _username = "";
@ -40,7 +41,6 @@ class App extends React.Component<any, any> {
todos: [], todos: [],
dailys: [], dailys: [],
habits: [], habits: [],
input_task: "",
} }
this.handleChangeTodos = this.handleChangeTodos.bind(this); this.handleChangeTodos = this.handleChangeTodos.bind(this);
this.handleChangeDailys = this.handleChangeDailys.bind(this); this.handleChangeDailys = this.handleChangeDailys.bind(this);
@ -167,9 +167,22 @@ class App extends React.Component<any, any> {
} }
} }
async sendEditTask(id: string, type: string) { async sendUpdateTask(id: string, type: string,message: string, title: string, notes: string) {
console.log(id, type) try {
return (<div className="loading">Loading....</div>) let response = await updateTask(this.username, this.credentials, id, type, title, notes);
let result = await response.json();
if (result.success === true) {
new Notice(message);
this.reloadData();
} else {
new Notice("Resyncing, please try again");
this.reloadData();
}
} catch (e) {
console.log(e);
new Notice("API Error: Please check credentials")
}
// console.log(id, type,title,notes)
} }
handleChangeTodos(event: any) { handleChangeTodos(event: any) {
@ -205,9 +218,11 @@ class App extends React.Component<any, any> {
this.state.tasks.dailys.forEach((element: any) => { this.state.tasks.dailys.forEach((element: any) => {
if (element.id == event.target.id) { if (element.id == event.target.id) {
if (element.id == event.target.id) { if (element.id == event.target.id) {
if ( event.target.innerText == 'create' ) { if ( event.target.attributes.title.value == 'submit' ) {
this.sendEditTask(event.target.id, "daily") const task_title = event.target.attributes['data-title'].value ? event.target.attributes['data-title'].value:element.text
} else if (event.target.innerText == 'clear') { const task_notes = event.target.attributes['data-notes'].value ? event.target.attributes['data-notes'].value:element.notes
this.sendUpdateTask(event.target.id,'daily',"Update!",task_title,task_notes)
} else if (event.target.attributes.title.value == 'delete') {
this.sendDeleteTask(event.target.id, "Deleted!") this.sendDeleteTask(event.target.id, "Deleted!")
} else if ( !element.completed) { } else if ( !element.completed) {
this.sendScore(event.target.id, "up", "Checked!") this.sendScore(event.target.id, "up", "Checked!")
@ -259,7 +274,7 @@ class App extends React.Component<any, any> {
if (event.target.innerText == 'clear') { if (event.target.innerText == 'clear') {
this.sendDeleteTask(event.target.id, "Deleted!") this.sendDeleteTask(event.target.id, "Deleted!")
} else if (event.target.innerText == 'create') { } else if (event.target.innerText == 'create') {
this.sendEditTask(event.target.id, "Edit!") this.sendUpdateTask(event.target.id,'reward',"Edit!","1","1")
} else { } else {
this.sendReward(target_id, "down", "Cost!") this.sendReward(target_id, "down", "Cost!")
} }

View file

@ -2,24 +2,36 @@ import Emoji from "react-emoji-render";
import * as React from "react"; import * as React from "react";
import ReactMarkdown from "react-markdown"; import ReactMarkdown from "react-markdown";
function DailyItem(props: any) { function DailyItem(props: any) {
return ( const [state, setState] = React.useState('view')
const [title, setTitle] = React.useState('')
const [notes, setNotes] = React.useState('')
if (state == 'view') {
return (
<div className="todo-item" id={props.id}> <div className="todo-item" id={props.id}>
<input type="checkbox" className="checkbox" id={props.id} onChange={props.onChange} checked={props.completed} /> <input type="checkbox" className="checkbox" id={props.id} onChange={props.onChange} checked={props.completed} />
<div className="todo-content"> <div className="todo-content">
<p><Emoji text={props.daily_text}></Emoji></p> <p><Emoji text={props.daily_text}></Emoji></p>
<ReactMarkdown children={props.daily_notes} /> <ReactMarkdown children={props.daily_notes} />
</div> </div>
<button className="task-operation" >
<button className="task-operation" > <span className="material-icons md-24" id={props.id} onClick={() => setState('edit')}>create</span>
<span className="material-icons md-24" id={props.id} onClick={props.onChange}>create</span>
</button> </button>
<button className="task-operation"> <button className="task-operation">
<span className="material-icons md-24" id={props.id} onClick={props.onChange}>clear</span> <span className="material-icons md-24" id={props.id} onClick={props.onChange} title="delete">clear</span>
</button> </button>
</div> </div>
) )
} else {
return (
<div className="edit-daily-item">
<input type="text" onChange={event => setTitle(event.target.value)} defaultValue={props.daily_text}></input>
<input type="text" onChange={event => setNotes(event.target.value)} defaultValue={props.daily_notes}></input>
<button className="task-operation" ><span className="material-icons md-24" id={props.id} onClick={function (e) { props.onChange(e); setState('view') }} title="submit" data-title={title} data-notes={notes}>check</span></button>
<button className="task-operation"><span className="material-icons md-24" id={props.id} onClick={() => setState('view')} title="cancel">clear</span></button>
</div>
)
}
} }
export default DailyItem export default DailyItem

View file

@ -1,25 +0,0 @@
import Emoji from "react-emoji-render";
import * as React from "react";
import ReactMarkdown from "react-markdown";
function EditDailyItem(props: any) {
return (
<div className="edit-todo-item" id={props.id}>
<input type="checkbox" className="checkbox" id={props.id} onChange={props.onChange} checked={props.completed} />
<div className="todo-content">
<p><Emoji text={props.daily_text}></Emoji></p>
<ReactMarkdown children={props.daily_notes} />
</div>
<button className="task-operation" >
<span className="material-icons md-24" id={props.id} onClick={props.onChange}>create</span>
</button>
<button className="task-operation">
<span className="material-icons md-24" id={props.id} onClick={props.onChange}>clear</span>
</button>
</div>
)
}
export default EditDailyItem

View file

@ -1,30 +1,30 @@
import * as React from "react"; import * as React from "react";
import DailyItem from "./DailyItem" import DailyItem from "./DailyItem"
import EditDailyItem from "./EditDailyItem"
import { Tab, Tabs, TabList, TabPanel } from "react-tabs"; import { Tab, Tabs, TabList, TabPanel } from "react-tabs";
import { Trans } from 'react-i18next'; import { Trans } from 'react-i18next';
export default function Index(props: any) { export default function Index(props: any) {
const [title, setTitle] = React.useState('') const [title, setTitle] = React.useState('')
if (props.dailys == undefined) { if (props.dailys == undefined) {
return <div id="classDisplay"> return <div id="classDisplay">
<input type="text" placeholder="添加每日任务" onChange={event => setTitle(event.target.value)} /> <input type="text" placeholder="添加每日任务" onChange={event => setTitle(event.target.value)} />
<button className="submit-button" id="add-daily" onClick={props.onChange} name={title}><Trans>submit</Trans></button> <button className="submit-button" id="add-daily" onClick={props.onChange} name={title}><Trans>submit</Trans></button>
<Trans>No Dailies Present</Trans> <Trans>No Dailies Present</Trans>
</div> </div>
} }
else { else {
const incompleteDailies = props.dailys.map((daily: any) => { const incompleteDailies = props.dailys.map((daily: any) => {
if (!daily.completed) if (!daily.completed)
return ( return (
<DailyItem key={daily.id} id={daily.id} daily_text={daily.text} daily_notes={daily.notes} onChange={props.onChange} completed={daily.completed} /> <DailyItem key={daily.id} id={daily.id} daily_text={daily.text} daily_notes={daily.notes} onChange={props.onChange} completed={daily.completed} status="view" />
) )
}) })
const completedDailies = props.dailys.map((daily: any) => { const completedDailies = props.dailys.map((daily: any) => {
if (daily.completed) if (daily.completed)
return <DailyItem key={daily.id} id={daily.id} daily_text={daily.text} daily_notes={daily.notes} onChange={props.onChange} completed={daily.completed} /> return <DailyItem key={daily.id} id={daily.id} daily_text={daily.text} daily_notes={daily.notes} onChange={props.onChange} completed={daily.completed} />
}) })
const display = <div id="classDisplay"> const display = <div id="classDisplay">
<Tabs> <Tabs>
<TabList> <TabList>
@ -32,9 +32,12 @@ export default function Index(props: any) {
<Tab><Trans>Completed</Trans></Tab> <Tab><Trans>Completed</Trans></Tab>
</TabList> </TabList>
<TabPanel> <TabPanel>
<input type="text" placeholder="添加每日任务" onChange={event => setTitle(event.target.value)} /> <input type="text" id="task-input-box" placeholder="添加每日任务" onChange={event => setTitle(event.target.value)} value={title} />
<button className="submit-button" id="add-daily" onClick={props.onChange} name={title}><Trans>submit</Trans></button> <button className="submit-button" id="add-daily" onClick={function (e) { setTitle(""); props.onChange(e) }} name={title}><Trans>submit</Trans></button>
<ul>{incompleteDailies}</ul> <div className="task-panel">
<ul>{incompleteDailies}</ul>
</div>
</TabPanel> </TabPanel>
<TabPanel> <TabPanel>
<ul>{completedDailies}</ul> <ul>{completedDailies}</ul>

View file

@ -83,4 +83,19 @@ export async function deleteTask(username: string, credentials: string, id: stri
} }
}) })
return(response) return(response)
}
export async function updateTask(username: string, credentials: string, id: string, type: string, title: string, notes: string) {
const url = "https://habitica.com/api/v4/tasks/".concat(id)
const response = fetch(url, {
method: 'PUT',
headers: {
"Content-Type": "application/json",
"x-client": "278e719e-5f9c-43b1-9dba-8b73343dc062-HabiticaSync",
"x-api-user": username,
"x-api-key": credentials,
},
body: JSON.stringify({id: id,type: type, text: title,notes: notes})
})
return(response)
} }

View file

@ -212,7 +212,12 @@ ul {
display: none; display: none;
left: 0px; left: 0px;
height: 88%; height: 88%;
/* overflow: scroll; */
}
.task-panel {
overflow: scroll; overflow: scroll;
height: 100%;
} }
.react-tabs__tab-panel--selected { .react-tabs__tab-panel--selected {