Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2026-08-29 10:09:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

web: ask password again if wrong during import

Browse Source
This commit is contained in:
Abdullah Atta
2026-08-24 09:44:07 +05:00
parent 2bb3d43db6
commit 9f2c9caee1
6 changed files with 45 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
apps/web/package-lock.json generated
View File

@@ -20,7 +20,7 @@
"@lingui/react": "5.1.2", "@lingui/react": "5.1.2",
"@mdi/js": "7.4.47", "@mdi/js": "7.4.47",
"@mdi/react": "1.6.1", "@mdi/react": "1.6.1",
"@notesnook-importer/core": "^2.6.0", "@notesnook-importer/core": "^2.6.1",
"@notesnook/common": "file:../../packages/common", "@notesnook/common": "file:../../packages/common",
"@notesnook/core": "file:../../packages/core", "@notesnook/core": "file:../../packages/core",
"@notesnook/crypto": "file:../../packages/crypto", "@notesnook/crypto": "file:../../packages/crypto",
@@ -2921,12 +2921,12 @@
} }
}, },
"node_modules/@notesnook-importer/applenotes": { "node_modules/@notesnook-importer/applenotes": {
"version": "1.1.0", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/@notesnook-importer/applenotes/-/applenotes-1.1.0.tgz", "resolved": "https://registry.npmjs.org/@notesnook-importer/applenotes/-/applenotes-1.1.1.tgz",
"integrity": "sha512-6mV6QtYqNqomyHJsWA926I1X8BsoM/6R3X8cdF7d4sg5cfkjENt2hoayBiW1ONK92MM9rU6mbJlqDSDEDinXPg==", "integrity": "sha512-an3qV59xdHU24kuZr0UZUIrIF/5nqzhINw0wtKRE9NEFYItywoTbFI8TnOTaJu6KNCDznYSQ6JoP5XLX9bo+5A==",
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",
"dependencies": { "dependencies": {
"@notesnook-importer/types": "^1.1.0", "@notesnook-importer/types": "^1.1.1",
"entities": "^4.4.0", "entities": "^4.4.0",
"fflate": "^0.7.4", "fflate": "^0.7.4",
"protobufjs": "^8.7.2" "protobufjs": "^8.7.2"
@@ -2951,18 +2951,18 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/@notesnook-importer/core": { "node_modules/@notesnook-importer/core": {
"version": "2.6.0", "version": "2.6.1",
"resolved": "https://registry.npmjs.org/@notesnook-importer/core/-/core-2.6.0.tgz", "resolved": "https://registry.npmjs.org/@notesnook-importer/core/-/core-2.6.1.tgz",
"integrity": "sha512-HjVvNgH6hFDMM/m3i+7GNDLMfcqAvNessDMS+JBWp70k8w8m1KltkVL2E6bng/zRRG6hisJJMSQzFOwpTBS2Ag==", "integrity": "sha512-RuIeYZbGk26lq/Q8A6PernlIS7fIJWgmwhtA069AhutpzojAx57GkKF6Zmo6TWa7eID0mmxksHrcGDuaOLZzcA==",
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",
"dependencies": { "dependencies": {
"@notesnook-importer/applenotes": "^1.1.0", "@notesnook-importer/applenotes": "^1.1.1",
"@notesnook-importer/enex": "^2.5.0", "@notesnook-importer/enex": "^2.5.1",
"@notesnook-importer/onenote": "^1.1.0", "@notesnook-importer/onenote": "^1.1.1",
"@notesnook-importer/samsung-notes": "^1.1.0", "@notesnook-importer/samsung-notes": "^1.1.1",
"@notesnook-importer/storage": "^2.5.0", "@notesnook-importer/storage": "^2.5.1",
"@notesnook-importer/types": "^1.1.0", "@notesnook-importer/types": "^1.1.1",
"@notesnook-importer/znel": "^2.5.0", "@notesnook-importer/znel": "^2.5.1",
"@stablelib/chacha20poly1305": "^1.0.1", "@stablelib/chacha20poly1305": "^1.0.1",
"@streamparser/json": "^0.0.10", "@streamparser/json": "^0.0.10",
"@zip.js/zip.js": "^2.7.32", "@zip.js/zip.js": "^2.7.32",
@@ -3020,9 +3020,9 @@
} }
}, },
"node_modules/@notesnook-importer/enex": { "node_modules/@notesnook-importer/enex": {
"version": "2.5.0", "version": "2.5.1",
"resolved": "https://registry.npmjs.org/@notesnook-importer/enex/-/enex-2.5.0.tgz", "resolved": "https://registry.npmjs.org/@notesnook-importer/enex/-/enex-2.5.1.tgz",
"integrity": "sha512-oqlg0SCqwTDmqGdi/p6m5FpcaKspIhDG08g/2fm2xIAYH95WJlyS4nb4pygyJGsywrq1USgIQ/Bup9hZ4jJKeA==", "integrity": "sha512-faQwGE58RFJaY5P/6C2jPuO/coycpAFwQgFE5ixPqvlSzRCCuA7+IBnlnn6BbsBIeFoaplEThP9hEYo9kYqoXg==",
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",
"dependencies": { "dependencies": {
"base64-js": "^1.5.1", "base64-js": "^1.5.1",
@@ -3035,9 +3035,9 @@
} }
}, },
"node_modules/@notesnook-importer/onenote": { "node_modules/@notesnook-importer/onenote": {
"version": "1.1.0", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/@notesnook-importer/onenote/-/onenote-1.1.0.tgz", "resolved": "https://registry.npmjs.org/@notesnook-importer/onenote/-/onenote-1.1.1.tgz",
"integrity": "sha512-V0cFx4QsC873wJsh5ONNG/pTAdTN+9LBYIAEIi+U6ZubTfm8Y2zIn/eBabVpFO62OvdD551EcFIbto5CTGJOrg==", "integrity": "sha512-OuC7UMUxoSTmFgtKm0pxNc6gNWnZoF2h3NX78Xo8qARHiz/6+BCmuN/1M/R33CvvpMsOIzLgbhAM248UUxW80A==",
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",
"dependencies": { "dependencies": {
"fflate": "^0.7.4" "fflate": "^0.7.4"
@@ -3050,9 +3050,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/@notesnook-importer/samsung-notes": { "node_modules/@notesnook-importer/samsung-notes": {
"version": "1.1.0", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/@notesnook-importer/samsung-notes/-/samsung-notes-1.1.0.tgz", "resolved": "https://registry.npmjs.org/@notesnook-importer/samsung-notes/-/samsung-notes-1.1.1.tgz",
"integrity": "sha512-2/2WbDqBBYQ46qkpPf4M5mdgHgSsjBlyTxWQsr0jv5l2j9TedxKE6NwmMxlrRJFkLxNBnNw3Yj1E437h7AJpqA==", "integrity": "sha512-XbpBqd9jR+cAkaNO/JhYiq+0Xb+9aHWaIRYg3+agvnKRFwGHqR7fyqfIaWdOGyugHG4Jtu92Ee1F5unJRROTuQ==",
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",
"dependencies": { "dependencies": {
"fflate": "^0.7.4" "fflate": "^0.7.4"
@@ -3065,21 +3065,21 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/@notesnook-importer/storage": { "node_modules/@notesnook-importer/storage": {
"version": "2.5.0", "version": "2.5.1",
"resolved": "https://registry.npmjs.org/@notesnook-importer/storage/-/storage-2.5.0.tgz", "resolved": "https://registry.npmjs.org/@notesnook-importer/storage/-/storage-2.5.1.tgz",
"integrity": "sha512-7HpvJkafCs3Ba0DdzZA8QecLfdN7D7V3g4773/iwTsRxa07YTRcavmV2jBGY6DuMaTkJio/Q/M/kSI0m5yiU6A==", "integrity": "sha512-XZswbzbAjjCbT/u6BgfjCss+WX1lx50YMIyO4PHji8zIxwvkN55eMS6+BqQ+hpw7CMT/zyrSrZmsdhnjKJhRuQ==",
"license": "GPL-3.0-or-later" "license": "GPL-3.0-or-later"
}, },
"node_modules/@notesnook-importer/types": { "node_modules/@notesnook-importer/types": {
"version": "1.1.0", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/@notesnook-importer/types/-/types-1.1.0.tgz", "resolved": "https://registry.npmjs.org/@notesnook-importer/types/-/types-1.1.1.tgz",
"integrity": "sha512-hoS4jHoaXiFnbUTElxYdIY85BOqf1wke0B+Oe5ExbHuFdUDOI0AtZWyCwArG9t0vfUlYmhJ1v27QHOfeE1kxQQ==", "integrity": "sha512-urgH9MBGddrL0oII5miJ21W/ocXad3PRWSTEMHmShwU1zNpwByZupnGrKU1Cyew+p0BN51qJ7r1SuGwL7jh6LQ==",
"license": "GPL-3.0-or-later" "license": "GPL-3.0-or-later"
}, },
"node_modules/@notesnook-importer/znel": { "node_modules/@notesnook-importer/znel": {
"version": "2.5.0", "version": "2.5.1",
"resolved": "https://registry.npmjs.org/@notesnook-importer/znel/-/znel-2.5.0.tgz", "resolved": "https://registry.npmjs.org/@notesnook-importer/znel/-/znel-2.5.1.tgz",
"integrity": "sha512-8Tx+fcAPJQeyjJpk9+mrak4c+v186IExgpy16I25fRJwl35k5B77NS0gWNOCFX80levInoX8FoXNp8IanVb8Rg==", "integrity": "sha512-C9i9WDia16HCIfvCLDavqAhL/7Mt7/WMY2vb574UBLwrqi3olH1J9GFGD9gweoNcc48WUFgE2XRd0eLjWxVxkg==",
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",
"dependencies": { "dependencies": {
"base64-js": "^1.5.1", "base64-js": "^1.5.1",

2
apps/web/package.json
View File

@@ -18,7 +18,7 @@
"@lingui/react": "5.1.2", "@lingui/react": "5.1.2",
"@mdi/js": "7.4.47", "@mdi/js": "7.4.47",
"@mdi/react": "1.6.1", "@mdi/react": "1.6.1",
"@notesnook-importer/core": "^2.6.0", "@notesnook-importer/core": "^2.6.1",
"@notesnook/common": "file:../../packages/common", "@notesnook/common": "file:../../packages/common",
"@notesnook/core": "file:../../packages/core", "@notesnook/core": "file:../../packages/core",
"@notesnook/crypto": "file:../../packages/crypto", "@notesnook/crypto": "file:../../packages/crypto",

8
apps/web/src/components/importer/components/file-provider-handler.tsx
View File

@@ -280,7 +280,13 @@ export function FileProviderHandler(props: FileProviderHandlerProps) {
> >
{files.map((file, index) => ( {files.map((file, index) => (
<Flex <Flex
key={file.name} key={
file.name +
file.size +
file.lastModified +
file.webkitRelativePath +
index
}
sx={{ sx={{
p: 2, p: 2,
bg: index % 2 ? "transparent" : "background-secondary", bg: index % 2 ? "transparent" : "background-secondary",

4
packages/intl/locale/en.po
View File

@@ -2810,8 +2810,8 @@ msgid "Enter password"
msgstr "Enter password" msgstr "Enter password"
#: src/strings.ts:2812 #: src/strings.ts:2812
msgid "Enter password for {filename}" msgid "Enter password for \"{filename}\""
msgstr "Enter password for {filename}" msgstr "Enter password for \"{filename}\""
#: src/strings.ts:2100 #: src/strings.ts:2100
msgid "Enter pin or password to enable app lock." msgid "Enter pin or password to enable app lock."

2
packages/intl/locale/pseudo-LOCALE.po
View File

@@ -2799,7 +2799,7 @@ msgid "Enter password"
msgstr "" msgstr ""
#: src/strings.ts:2812 #: src/strings.ts:2812
msgid "Enter password for {filename}" msgid "Enter password for \"{filename}\""
msgstr "" msgstr ""
#: src/strings.ts:2100 #: src/strings.ts:2100

2
packages/intl/src/strings.ts
View File

@@ -2809,6 +2809,6 @@ Continue without attachments?`,
alignment: () => t`Alignment`, alignment: () => t`Alignment`,
browserStorageQuotaReached: () => browserStorageQuotaReached: () =>
t`Browser storage quota reached. Please delete some attachments from the attachment manager or clear some local data to free up space.`, t`Browser storage quota reached. Please delete some attachments from the attachment manager or clear some local data to free up space.`,
passwordFor: (filename: string) => t`Enter password for ${filename}`, passwordFor: (filename: string) => t`Enter password for "${filename}"`,
selectFolder: () => t`Select folder` selectFolder: () => t`Select folder`
}; };