-
Notifications
You must be signed in to change notification settings - Fork 84
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add the hover to the listing instead of showing the link, follows the proposal we worked on at the mobile hackfest Closes #1270
- Loading branch information
Showing
5 changed files
with
197 additions
and
127 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
58 changes: 58 additions & 0 deletions
58
frontend/src/components/application/VerificationIcon.stories.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| import React from "react" | ||
| import { Meta } from "@storybook/react" | ||
| import VerificationIcon from "./VerificationIcon" | ||
| import { | ||
| VerificationStatusLoginProvider, | ||
| VerificationStatusManual, | ||
| VerificationStatusWebsite, | ||
| } from "../../types/VerificationStatus" | ||
| export default { | ||
| title: "Components/Application/VerificationIcon", | ||
| component: VerificationIcon, | ||
| } as Meta<typeof VerificationIcon> | ||
|
|
||
| export const manualVerification = () => { | ||
| const verificationStatus: VerificationStatusManual = { | ||
| verified: true, | ||
| timestamp: 1678175850, | ||
| detail: "", | ||
| method: "manual", | ||
| } | ||
| return ( | ||
| <VerificationIcon | ||
| appId="org.flathub.Example" | ||
| verificationStatus={verificationStatus} | ||
| /> | ||
| ) | ||
| } | ||
| export const websiteVerification = () => { | ||
| const verificationStatus: VerificationStatusWebsite = { | ||
| verified: true, | ||
| timestamp: 1678175850, | ||
| detail: "", | ||
| method: "website", | ||
| website: "https://example.com", | ||
| } | ||
| return ( | ||
| <VerificationIcon | ||
| appId="com.example.Example" | ||
| verificationStatus={verificationStatus} | ||
| /> | ||
| ) | ||
| } | ||
| export const loginProviderVerification = () => { | ||
| const verificationStatus: VerificationStatusLoginProvider = { | ||
| verified: true, | ||
| timestamp: 1678175850, | ||
| login_name: "user_name", | ||
| method: "login_provider", | ||
| login_provider: "github", | ||
| detail: "", | ||
| } | ||
| return ( | ||
| <VerificationIcon | ||
| appId="io.github.Example" | ||
| verificationStatus={verificationStatus} | ||
| /> | ||
| ) | ||
| } |
125 changes: 125 additions & 0 deletions
125
frontend/src/components/application/VerificationIcon.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| import { FunctionComponent, useState } from "react" | ||
| import React from "react" | ||
|
|
||
| import { HiCheckBadge } from "react-icons/hi2" | ||
| import { Trans, useTranslation } from "next-i18next" | ||
| import { VerificationStatus } from "src/types/VerificationStatus" | ||
| import { | ||
| useFloating, | ||
| useHover, | ||
| useInteractions, | ||
| offset, | ||
| shift, | ||
| autoPlacement, | ||
| useRole, | ||
| useDismiss, | ||
| useFocus, | ||
| } from "@floating-ui/react-dom-interactions" | ||
| import { verificationProviderToHumanReadable } from "src/verificationProvider" | ||
| import { clsx } from "clsx" | ||
|
|
||
| interface Props { | ||
| appId: string | ||
| verificationStatus: VerificationStatus | ||
| } | ||
|
|
||
| const VerificationIcon: FunctionComponent<Props> = ({ | ||
| appId, | ||
| verificationStatus, | ||
| }) => { | ||
| const { t } = useTranslation() | ||
|
|
||
| const [isOpen, setIsOpen] = useState(false) | ||
| const { x, y, reference, floating, strategy, context, placement } = | ||
| useFloating({ | ||
| open: isOpen, | ||
| onOpenChange: setIsOpen, | ||
| middleware: [shift(), autoPlacement(), offset(6)], | ||
| }) | ||
| const hover = useHover(context, { move: false }) | ||
| const focus = useFocus(context) | ||
| const dismiss = useDismiss(context) | ||
| const role = useRole(context, { role: "tooltip" }) | ||
|
|
||
| const { getReferenceProps, getFloatingProps } = useInteractions([ | ||
| hover, | ||
| focus, | ||
| dismiss, | ||
| role, | ||
| ]) | ||
|
|
||
| if (verificationStatus?.verified == true) { | ||
| return ( | ||
| <> | ||
| <button ref={reference} {...getReferenceProps}> | ||
| <HiCheckBadge | ||
| className="h-5 w-5 text-flathub-celestial-blue" | ||
| aria-label={t("app-is-verified")} | ||
| /> | ||
| </button> | ||
|
|
||
| {isOpen && ( | ||
| <div | ||
| ref={floating} | ||
| style={{ | ||
| position: strategy, | ||
| top: y ?? 0, | ||
| left: x ?? 0, | ||
| }} | ||
| className={clsx( | ||
| "z-20 mx-1 max-w-sm rounded-xl p-4", | ||
| "border-1 border border-flathub-gray-x11 dark:border-flathub-sonic-silver", | ||
| "bg-flathub-white dark:bg-flathub-granite-gray dark:text-flathub-gainsborow", | ||
| )} | ||
| {...getFloatingProps()} | ||
| > | ||
| { | ||
| verificationStatus.method == "manual" ? ( | ||
| <Trans i18nKey={"verified-manually-tooltip"}> | ||
| The ownership of the <b>{{ app_id: appId }}</b> application ID | ||
| has been manually verified by Flathub staff | ||
| </Trans> | ||
| ) : verificationStatus.method == "website" ? ( | ||
| <Trans | ||
| i18nKey={"verified-website-tooltip"} | ||
| values={{ | ||
| app_id: appId, | ||
| website: verificationStatus.website, | ||
| }} | ||
| > | ||
| The ownership of the <b>{{ app_id: appId }}</b> application ID | ||
| has been verified by the owner of{" "} | ||
| <b>{{ website: verificationStatus.website }}</b> | ||
| </Trans> | ||
| ) : verificationStatus.method == "login_provider" ? ( | ||
| <Trans i18nKey={"verified-login-provider-tooltip"}> | ||
| The ownership of the <b>{{ app_id: appId }}</b> application ID | ||
| has been verified by{" "} | ||
| <b> | ||
| @ | ||
| {{ | ||
| login_provider: verificationProviderToHumanReadable( | ||
| verificationStatus.login_provider, | ||
| ), | ||
| }} | ||
| </b>{" "} | ||
| on{" "} | ||
| <b> | ||
| {{ | ||
| login_name: verificationStatus.login_name, | ||
| }} | ||
| </b> | ||
| </Trans> | ||
| ) : ( | ||
| t("verified") | ||
| ) // Should never happen | ||
| } | ||
| </div> | ||
| )} | ||
| </> | ||
| ) | ||
| } else { | ||
| return null | ||
| } | ||
| } | ||
| export default VerificationIcon |