Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed #140 #154

Merged
merged 1 commit into from
Mar 2, 2024
Merged

Fixed #140 #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ v0.4.5
- Fixed list of caldav accounts not updating after adding or deleting a caldav account.
- Fixed Force sync button's function in /accounts/caldav page.
- Logout now deletes the local dexie db for security.

- Fixed #140
- Fixed flickering of Quick Add info modal.

v0.4.4
- Version bump to 0.4.4
- Fixed bug #128
Expand Down
8 changes: 2 additions & 6 deletions COMMITMESSAGE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
- Fixed #152
- Now Caldav registration is done via a POST request.
- Fixed problems of duplication of calendars post adding a new CalDAV account.
- Fixed list of caldav accounts not updating after adding or deleting a caldav account.
- Fixed Force sync button's function in /accounts/caldav page.
- Logout now deletes the local dexie db for security.
Fixed #140
- Fixed flickering of Quick Add info modal.
34 changes: 27 additions & 7 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@mui/material": "5.11.13",
"axios": "1.6.1",
"bcryptjs": "2.4.3",
"bootstrap": "5.3.2",
"bootstrap": "5.3.3",
"bootstrap-icons": "1.10.3",
"crypto-js": "4.2.0",
"dexie": "3.2.3",
Expand Down
130 changes: 66 additions & 64 deletions src/components/common/AddTask/AddInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,84 +5,86 @@ import Button from 'react-bootstrap/Button';
import { getI18nObject } from '@/helpers/frontend/general';
import { Col, Row } from 'react-bootstrap';
import Link from 'next/link';

const InformationModal = (props) => {
const i18next= getI18nObject()
return (
<Modal
{...props}
centered
>
<Modal.Header closeButton>
<Modal.Title id="contained-modal-title-vcenter">
{i18next.t("QUICK_ADD")}
</Modal.Title>
</Modal.Header>
<Modal.Body>
{i18next.t("QUICK_ADD_DESC1")}
<h2>{i18next.t("SHORTCUTS")}</h2>
<div style={{textAlign:"center"}}>
<Row>
<Col>
<b>{i18next.t("SYNTAX")}</b>
</Col>
<Col>
<b>{i18next.t("DESCRIPTION")}</b>
</Col>
</Row>
<Row >
<Col>
@:date
</Col>
<Col>
{i18next.t("QUICK_ADD_DATE_DESCRIPTION")}
</Col>
</Row>
<Row >
<Col>
!:priority
</Col>
<Col>
{i18next.t("QUICK_ADD_PRIORITY_DESCRIPTION")}
</Col>
</Row>
<Row >
<Col>
#:label
</Col>
<Col>
{i18next.t("QUICK_ADD_LABEL_DESCRIPTION")}
</Col>
</Row>
</div>
<br />
<Link href="https://manage-my-damn-life-nextjs.readthedocs.io/en/latest/Feature%20Guide/QuickAdd/" target='_blank'>{i18next.t("LEARN_MORE")}</Link>
</Modal.Body>
<Modal.Footer>
<Button onClick={props.onHide}>{i18next.t("CLOSE")}</Button>
</Modal.Footer>
</Modal>
);
}
type ChildProps = {
}
const AddInfo: FC<ChildProps> = () => {
const [showModal, setShow]=useState(false)

const onClickInfo = () =>{
setShow(true)
}

const i18next= getI18nObject()
function InformationModal(props) {
return (
<Modal
{...props}
size="md"
centered
>
<Modal.Header closeButton>
<Modal.Title id="contained-modal-title-vcenter">
{i18next.t("QUICK_ADD")}
</Modal.Title>
</Modal.Header>
<Modal.Body>
{i18next.t("QUICK_ADD_DESC1")}
<h2>{i18next.t("SHORTCUTS")}</h2>
<div style={{textAlign:"center"}}>
<Row>
<Col>
<b>{i18next.t("SYNTAX")}</b>
</Col>
<Col>
<b>{i18next.t("DESCRIPTION")}</b>
</Col>
</Row>
<Row >
<Col>
@:date
</Col>
<Col>
{i18next.t("QUICK_ADD_DATE_DESCRIPTION")}
</Col>
</Row>
<Row >
<Col>
!:priority
</Col>
<Col>
{i18next.t("QUICK_ADD_PRIORITY_DESCRIPTION")}
</Col>
</Row>
<Row >
<Col>
#:label
</Col>
<Col>
{i18next.t("QUICK_ADD_LABEL_DESCRIPTION")}
</Col>
</Row>
</div>
<br />
<Link href="https://manage-my-damn-life-nextjs.readthedocs.io/en/latest/Feature%20Guide/QuickAdd/" target='_blank'>{i18next.t("LEARN_MORE")}</Link>
</Modal.Body>
<Modal.Footer>
<Button onClick={props.onHide}>{i18next.t("CLOSE")}</Button>
</Modal.Footer>
</Modal>
);
}

return (
<>

<div style={{display: "flex", justifyContent:"center", alignItems:"center", height:"100%"}}><MdInfo size={24} onClick={onClickInfo} />
<div style={{display: "flex", justifyContent:"center", alignItems:"center", height:"100%"}}>
<MdInfo size={24} onClick={onClickInfo} />
<InformationModal
show={showModal}
onHide={() => setShow(false)}
/>
show={showModal}
onHide={() => setShow(false)}
/>
</div>
</>
</>

)
};
Expand Down
2 changes: 1 addition & 1 deletion src/pages/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export default function HomePage() {



var finalOutput = (<CombinedView updated={updated} onSynComplete={onSynComplete} />)
let finalOutput = (<CombinedView updated={updated} onSynComplete={onSynComplete} />)

return(
<div >
Expand Down
Loading