From 4010f37f68420e7eac5bc478f6bdc9a7e4d40a5f Mon Sep 17 00:00:00 2001 From: kkzzhizhou <806508401@qq.com> Date: Tue, 30 Nov 2021 09:25:31 +0800 Subject: [PATCH] fix some problems --- src/i18n/zh-cn.json | 3 ++- src/view/App.tsx | 24 +++++++++---------- .../Taskview/Habitsview/HabitItem.tsx | 4 ++-- .../Taskview/Rewardview/RewardItem.tsx | 4 ++-- src/view/habiticaAPI.ts | 2 +- styles.css | 6 ++++- 6 files changed, 24 insertions(+), 19 deletions(-) diff --git a/src/i18n/zh-cn.json b/src/i18n/zh-cn.json index 25f19f2..4906fc7 100644 --- a/src/i18n/zh-cn.json +++ b/src/i18n/zh-cn.json @@ -30,5 +30,6 @@ "Add Daily Task": "添加每日任务", "Add Todo": "添加待办事项", "Add Habit": "添加习惯", - "Add Reward": "添加奖励" + "Add Reward": "添加奖励", + "Click me to refresh": "点我更新数据" } \ No newline at end of file diff --git a/src/view/App.tsx b/src/view/App.tsx index 2248622..df59575 100644 --- a/src/view/App.tsx +++ b/src/view/App.tsx @@ -56,7 +56,7 @@ class App extends React.Component { if (cronDate.getDate() != now.getDate() || (cronDate.getMonth() != now.getMonth() || cronDate.getFullYear() != now.getFullYear())) { return (
- +
); } @@ -248,17 +248,17 @@ class App extends React.Component { this.sendDeleteTask(event.target.id, i18next.t('Deleted!')) } else { this.state.tasks.habits.forEach((element: any) => { - if (event.target.attributes.title.value == 'submit') { - const task_title = event.target.attributes['data-title'].value ? event.target.attributes['data-title'].value : element.text - const task_notes = event.target.attributes['data-notes'].value ? event.target.attributes['data-notes'].value : element.notes - this.sendUpdateTask(event.target.id, 'daily', i18next.t("Update!"), task_title, task_notes) - } else { - const target_id = event.target.id.slice(4) - if (event.target.id.slice(0, 4) == "plus") { - this.sendScore(target_id, "up", i18next.t('Plus!')) - } else { - this.sendScore(target_id, "down", i18next.t("Minus :(")) + if (element.id == event.target.id) { + if (event.target.attributes.title && event.target.attributes.title.value == 'submit') { + const task_title = event.target.attributes['data-title'].value ? event.target.attributes['data-title'].value : element.text + const task_notes = event.target.attributes['data-notes'].value ? event.target.attributes['data-notes'].value : element.notes + this.sendUpdateTask(event.target.id, 'daily', i18next.t("Update!"), task_title, task_notes) + } else if (event.target.attributes.title && event.target.attributes.title.value == 'plus') { + this.sendScore(event.target.id, "up", i18next.t('Plus!')) + } else if (event.target.attributes.title && event.target.attributes.title.value == 'mins') { + this.sendScore(event.target.id, "down", i18next.t("Minus :(")) } + } }) } @@ -278,7 +278,7 @@ class App extends React.Component { } else if (event.target.attributes.title.value == 'submit') { const task_title = event.target.attributes['data-title'].value ? event.target.attributes['data-title'].value : element.text const task_notes = event.target.attributes['data-notes'].value ? event.target.attributes['data-notes'].value : element.notes - const task_coin = event.target.attributes['data-coin'].value ? event.target.attributes['data-coin'].value : element.reward_value + const task_coin = event.target.attributes['data-coin'].value ? event.target.attributes['data-coin'].value : element.value this.sendUpdateTask(event.target.id, 'reward', i18next.t('Edit!'), task_title, task_notes, task_coin) } else { this.sendReward(target_id, "down", i18next.t('Cost!')) diff --git a/src/view/Components/Taskview/Habitsview/HabitItem.tsx b/src/view/Components/Taskview/Habitsview/HabitItem.tsx index 81f5bb8..0cebbe5 100644 --- a/src/view/Components/Taskview/Habitsview/HabitItem.tsx +++ b/src/view/Components/Taskview/Habitsview/HabitItem.tsx @@ -9,10 +9,10 @@ function HabitItem(props: any) { if (state == 'view') { return (
- -
diff --git a/src/view/Components/Taskview/Rewardview/RewardItem.tsx b/src/view/Components/Taskview/Rewardview/RewardItem.tsx index 6e45b14..162a20f 100644 --- a/src/view/Components/Taskview/Rewardview/RewardItem.tsx +++ b/src/view/Components/Taskview/Rewardview/RewardItem.tsx @@ -5,7 +5,7 @@ function RewardItem(props: any) { const [state, setState] = React.useState('view') const [title, setTitle] = React.useState('') const [notes, setNotes] = React.useState('') - const [coin, setCoin] = React.useState(0) + const [coin, setCoin] = React.useState('0') if (state === 'view') { return (
@@ -27,7 +27,7 @@ function RewardItem(props: any) {
setTitle(event.target.value)} defaultValue={props.reward_text}> setNotes(event.target.value)} defaultValue={props.reward_notes}> - setNotes(event.target.value)} defaultValue={props.reward_value}> + setCoin(event.target.value)} defaultValue={props.reward_value}>
diff --git a/src/view/habiticaAPI.ts b/src/view/habiticaAPI.ts index a146b7e..6b7238d 100644 --- a/src/view/habiticaAPI.ts +++ b/src/view/habiticaAPI.ts @@ -95,7 +95,7 @@ export async function updateTask(username: string, credentials: string, id: stri "x-api-user": username, "x-api-key": credentials, }, - body: type === 'reward' ? JSON.stringify({id: id,type: type, text: title,notes: notes, coin: coin}):JSON.stringify({id: id,type: type, text: title,notes: notes}) + body: type === 'reward' ? JSON.stringify({id: id,type: type, text: title,notes: notes, value: coin}):JSON.stringify({id: id,type: type, text: title,notes: notes}) }) return(response) } \ No newline at end of file diff --git a/styles.css b/styles.css index 394b0fd..eeecb7d 100644 --- a/styles.css +++ b/styles.css @@ -130,7 +130,7 @@ input[type=checkbox]:focus { .plugin-root { min-width: 260px; display: grid; - grid-template-rows: 97% 1% 0.5%; + grid-template-rows: 94% 4% 1% 1%; height: inherit; } @@ -138,6 +138,10 @@ input[type=checkbox]:focus { height: 100%; } +.view-content { + margin-bottom: 0; +} + .substats { font-size: medium; }