Minor error fixes

This commit is contained in:
SuperChamp234 2022-01-15 09:45:50 +05:30
parent 82780ba589
commit c1851c2fc6
5 changed files with 7 additions and 4 deletions

View file

@ -86,7 +86,6 @@ class App extends React.Component<any, any> {
new Notice('Login Failed, Please check credentials and try again!'); new Notice('Login Failed, Please check credentials and try again!');
} }
else { else {
console.log(result);
this.setState({ this.setState({
isLoaded: true, isLoaded: true,
user_data: result, user_data: result,

View file

@ -12,7 +12,7 @@ function DailyItem(props: any) {
<p><span dangerouslySetInnerHTML={{__html: text_html}}></span></p> <p><span dangerouslySetInnerHTML={{__html: text_html}}></span></p>
<div className="description" dangerouslySetInnerHTML={{__html: note_html}}></div> <div className="description" dangerouslySetInnerHTML={{__html: note_html}}></div>
{/* {console.log(props.checklist)} */} {/* {console.log(props.checklist)} */}
<DailySubTasks subtasks={props.daily_subtasks} onChangeChecklistItem={props.onChangeChecklistItem}></DailySubTasks> <DailySubTasks key={props.daily_subtasks.id} subtasks={props.daily_subtasks} onChangeChecklistItem={props.onChangeChecklistItem}></DailySubTasks>
</div> </div>
</div> </div>

View file

@ -7,7 +7,7 @@ function DailySubTasks(props: any) {
const subtasks = props.subtasks.map((subtask: any) => { const subtasks = props.subtasks.map((subtask: any) => {
let subtask_text = renderMarkdown(subtask.text); let subtask_text = renderMarkdown(subtask.text);
return ( return (
<div className="subtask" id={subtask.id}> <div className="subtask" id={subtask.id} key={subtask.id} >
<input id={subtask.id} type="checkbox" className="checkbox-checklist" onChange={props.onChangeChecklistItem} checked={subtask.completed} /> <input id={subtask.id} type="checkbox" className="checkbox-checklist" onChange={props.onChangeChecklistItem} checked={subtask.completed} />
<p id={subtask.id}><span dangerouslySetInnerHTML={{__html: subtask_text}}></span></p> <p id={subtask.id}><span dangerouslySetInnerHTML={{__html: subtask_text}}></span></p>
</div> </div>

View file

@ -6,7 +6,7 @@ function TodoSubTasks(props: any) {
const subtasks = props.subtasks.map((subtask: any) => { const subtasks = props.subtasks.map((subtask: any) => {
let subtask_text = renderMarkdown(subtask.text); let subtask_text = renderMarkdown(subtask.text);
return ( return (
<div className="subtask" id={subtask.id}> <div className="subtask" id={subtask.id} key={subtask.id}>
<input type="checkbox" className="checkbox" onChange={props.onChange} checked={subtask.completed} id={subtask.id}/> <input type="checkbox" className="checkbox" onChange={props.onChange} checked={subtask.completed} id={subtask.id}/>
<p id={subtask.id}><span dangerouslySetInnerHTML={{__html: subtask_text}}></span></p> <p id={subtask.id}><span dangerouslySetInnerHTML={{__html: subtask_text}}></span></p>
</div> </div>

View file

@ -3,6 +3,10 @@ import markdownitEmoji from "markdown-it-emoji"
import twemoji from "twemoji"; import twemoji from "twemoji";
export default function renderMarkdown(markdown: string) { export default function renderMarkdown(markdown: string) {
//check if markdown is empty or not a string
if (markdown === "" || markdown === undefined) {
return "";
}
const md = new MarkdownIt({ const md = new MarkdownIt({
html: true, html: true,
breaks: true, breaks: true,