Skip to content

Commit

Permalink
support nextcloud 28
Browse files Browse the repository at this point in the history
  • Loading branch information
matteo-convertino committed Jan 18, 2024
1 parent dde2175 commit dba26f7
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 5 deletions.
4 changes: 2 additions & 2 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ This way, the migration from Google Authenticator to OTP Manager will be quick a
* [Official iOS App](https://apps.apple.com/us/app/nextcloud-otp-manager/id6471510170)
]]>
</description>
<version>0.3.2</version>
<version>0.3.3</version>
<licence>agpl</licence>
<author mail="matteo@convertino.cloud" homepage="https://www.convertino.cloud">Matteo Convertino</author>
<namespace>OtpManager</namespace>
Expand All @@ -42,7 +42,7 @@ This way, the migration from Google Authenticator to OTP Manager will be quick a
<repository>https://github.com/matteo-convertino/otpmanager-nextcloud</repository>
<screenshot>https://raw.githubusercontent.com/matteo-convertino/otpmanager-nextcloud/c683075330a6d6839cbaa5e8b847eae44d250903/img/screenshots/1.png</screenshot>
<dependencies>
<nextcloud min-version="26" max-version="27" />
<nextcloud min-version="26" max-version="28" />
</dependencies>
<navigations>
<navigation>
Expand Down
Empty file modified js/otpmanager-main.js
100644 → 100755
Empty file.
Empty file modified js/otpmanager-main.js.LICENSE.txt
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion js/otpmanager-main.js.map
100644 → 100755

Large diffs are not rendered by default.

22 changes: 20 additions & 2 deletions src/js/modals/ImportAccounts.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ import {
Button,
FileInput,
Group,
PasswordInput
PasswordInput,
Alert,
Anchor,
} from "@mantine/core";
import { useForm } from "@mantine/form";
import { showNotification, updateNotification } from "@mantine/notifications";
Expand All @@ -13,7 +15,8 @@ import { generateUrl } from "@nextcloud/router";
import {
IconCheck,
IconFileImport,
IconX
IconX,
IconInfoCircle,
} from "@tabler/icons-react";

export function ImportAccounts({ setAccounts, setFetchState, closeModal }) {
Expand Down Expand Up @@ -106,6 +109,21 @@ export function ImportAccounts({ setAccounts, setFetchState, closeModal }) {

return (
<>
{/*<Alert
variant="light"
color="blue"
radius="md"
title="Other way to import"
icon={<IconInfoCircle />}
>
If you're using FreeOTP and you want to import your accounts here, take
a look at{" "}
<Anchor href="https://github.com/betabrandao/utils/blob/main/filecopys/freeotp2nextcloudotp.py" target="_blank">
this script
</Anchor>
.
</Alert>*/}

<FileInput
label="Import file"
placeholder="Click here to upload your .json file"
Expand Down

0 comments on commit dba26f7

Please sign in to comment.