Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion frontend/src/domains/DomainsPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
useDisclosure,
useToast,
} from '@chakra-ui/react'
import { ExternalLinkIcon } from '@chakra-ui/icons'
import {ExternalLinkIcon} from '@chakra-ui/icons'
import { ErrorBoundary } from 'react-error-boundary'

import { DomainCard } from './DomainCard'
Expand All @@ -28,6 +28,7 @@ import {
import { SearchBox } from '../components/SearchBox'
import { useLazyQuery } from '@apollo/client'
import { ExportButton } from '../components/ExportButton'
import {SubdomainWarning} from "./SubdomainWarning"

export default function DomainsPage() {
const toast = useToast()
Expand Down Expand Up @@ -244,6 +245,9 @@ export default function DomainsPage() {
orderByOptions={orderByOptions}
placeholder={t`Search for a domain`}
/>

<SubdomainWarning mb="4"/>

{domainList}

<RelayPaginationControls
Expand Down
28 changes: 28 additions & 0 deletions frontend/src/domains/SubdomainWarning.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import React from 'react'
import { Flex, Text } from '@chakra-ui/react'
import { WarningTwoIcon } from '@chakra-ui/icons'
import { Trans } from '@lingui/macro'

export function SubdomainWarning({ ...props }) {
return (
<Flex
direction="row"
border="1px solid black"
rounded="lg"
p="1rem"
bg="primary"
{...props}
>
<WarningTwoIcon mr="1rem" my="auto" color="yellow " />
<Text color="white" fontWeight="bold">
<Trans>
Tracker HSTS and HTTPS results display incorrectly when a domain has a
non-compliant WWW subdomain. Check your WWW subdomain if your results
appear incorrect. For example, the results for www.canada.ca in the
Tracker platform are included in the results for canada.ca. Work is in
progress to separate the results.
</Trans>
</Text>
</Flex>
)
}
2 changes: 2 additions & 0 deletions frontend/src/guidance/DmarcGuidancePage.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import { LoadingMessage } from '../components/LoadingMessage'
import { useDocumentTitle } from '../utilities/useDocumentTitle'
import { GET_GUIDANCE_TAGS_OF_DOMAIN } from '../graphql/queries'
import { ScanDomainButton } from '../domains/ScanDomainButton'
import {SubdomainWarning} from "../domains/SubdomainWarning"

export default function DmarcGuidancePage() {
const { domainSlug, activeTab } = useParams()
Expand Down Expand Up @@ -120,6 +121,7 @@ export default function DmarcGuidancePage() {
<TabPanels>
<TabPanel>
<ErrorBoundary FallbackComponent={ErrorFallbackMessage}>
<SubdomainWarning mb="4"/>
<ScanCard scanType="web" scanData={webScan} status={webStatus} />
</ErrorBoundary>
</TabPanel>
Expand Down
Loading