diff --git a/CHANGELOG b/CHANGELOG index 0ae9086..b387fd8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 diff --git a/COMMITMESSAGE.md b/COMMITMESSAGE.md index 172f7e3..17fbac5 100644 --- a/COMMITMESSAGE.md +++ b/COMMITMESSAGE.md @@ -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. \ No newline at end of file +Fixed #140 + - Fixed flickering of Quick Add info modal. \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 84eb097..3fa7c2c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,7 +26,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", @@ -3742,9 +3742,9 @@ "license": "ISC" }, "node_modules/bootstrap": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.2.tgz", - "integrity": "sha512-D32nmNWiQHo94BKHLmOrdjlL05q1c8oxbtBphQFb9Z5to6eGRDCm0QgeaZ4zFBHzfg2++rqa2JkqCcxDy0sH0g==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz", + "integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==", "funding": [ { "type": "github", @@ -5208,13 +5208,14 @@ } }, "node_modules/es5-ext": { - "version": "0.10.62", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz", - "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==", + "version": "0.10.64", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz", + "integrity": "sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==", "hasInstallScript": true, "dependencies": { "es6-iterator": "^2.0.3", "es6-symbol": "^3.1.3", + "esniff": "^2.0.1", "next-tick": "^1.1.0" }, "engines": { @@ -5911,6 +5912,25 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/esniff": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz", + "integrity": "sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==", + "dependencies": { + "d": "^1.0.1", + "es5-ext": "^0.10.62", + "event-emitter": "^0.3.5", + "type": "^2.7.2" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esniff/node_modules/type": { + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz", + "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==" + }, "node_modules/espree": { "version": "9.6.1", "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", diff --git a/package.json b/package.json index f43f636..1f89129 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/components/common/AddTask/AddInfo.tsx b/src/components/common/AddTask/AddInfo.tsx index 9bc6e8c..47a34ab 100644 --- a/src/components/common/AddTask/AddInfo.tsx +++ b/src/components/common/AddTask/AddInfo.tsx @@ -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 ( + + + + {i18next.t("QUICK_ADD")} + + + + {i18next.t("QUICK_ADD_DESC1")} +

{i18next.t("SHORTCUTS")}

+
+ + + {i18next.t("SYNTAX")} + + + {i18next.t("DESCRIPTION")} + + + + + @:date + + + {i18next.t("QUICK_ADD_DATE_DESCRIPTION")} + + + + + !:priority + + + {i18next.t("QUICK_ADD_PRIORITY_DESCRIPTION")} + + + + + #:label + + + {i18next.t("QUICK_ADD_LABEL_DESCRIPTION")} + + +
+
+ {i18next.t("LEARN_MORE")} + + + + + + ); +} type ChildProps = { } const AddInfo: FC = () => { const [showModal, setShow]=useState(false) + const onClickInfo = () =>{ setShow(true) } const i18next= getI18nObject() - function InformationModal(props) { - return ( - - - - {i18next.t("QUICK_ADD")} - - - - {i18next.t("QUICK_ADD_DESC1")} -

{i18next.t("SHORTCUTS")}

-
- - - {i18next.t("SYNTAX")} - - - {i18next.t("DESCRIPTION")} - - - - - @:date - - - {i18next.t("QUICK_ADD_DATE_DESCRIPTION")} - - - - - !:priority - - - {i18next.t("QUICK_ADD_PRIORITY_DESCRIPTION")} - - - - - #:label - - - {i18next.t("QUICK_ADD_LABEL_DESCRIPTION")} - - -
-
- {i18next.t("LEARN_MORE")} - - - - - - ); - } + return ( <> -
+
+ setShow(false)} - /> + show={showModal} + onHide={() => setShow(false)} + />
- + ) }; diff --git a/src/pages/index.js b/src/pages/index.js index 1377ba3..3b7fa16 100644 --- a/src/pages/index.js +++ b/src/pages/index.js @@ -59,7 +59,7 @@ export default function HomePage() { - var finalOutput = () + let finalOutput = () return(