Skip to content

Commit 3aecece

Browse files
Terms & conditions (canada-ca#2422)
* add Terms and Conditions Page
1 parent f37f473 commit 3aecece

5 files changed

Lines changed: 861 additions & 69 deletions

File tree

frontend/src/App.js

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ const ForgotPasswordPage = lazy(() => import('./ForgotPasswordPage'))
3232
const ResetPasswordPage = lazy(() => import('./ResetPasswordPage'))
3333
const DmarcByDomainPage = lazy(() => import('./DmarcByDomainPage'))
3434
const DmarcGuidancePage = lazy(() => import('./DmarcGuidancePage'))
35+
const TermsConditionsPage = lazy(() => import('./TermsConditionsPage'))
3536
const TwoFactorAuthenticatePage = lazy(() =>
3637
import('./TwoFactorAuthenticatePage'),
3738
)
@@ -128,6 +129,12 @@ export default function App() {
128129
title={t`Reset Password`}
129130
/>
130131

132+
<Page
133+
path="/terms-and-conditions"
134+
component={TermsConditionsPage}
135+
title={t`Terms & Conditions`}
136+
/>
137+
131138
<PrivatePage path="/organizations" title={t`Organizations`} exact>
132139
<Organizations />
133140
</PrivatePage>
@@ -205,17 +212,11 @@ export default function App() {
205212
>
206213
<Trans>Privacy</Trans>
207214
</Link>
208-
<Link
209-
ml={4}
210-
isExternal={true}
211-
href={
212-
i18n.locale === 'en'
213-
? 'https://www.canada.ca/en/transparency/terms.html'
214-
: 'https://www.canada.ca/fr/transparence/avis.html'
215-
}
216-
>
215+
216+
<Link href="/terms-and-conditions" ml={4}>
217217
<Trans>Terms & conditions</Trans>
218218
</Link>
219+
219220
<Link
220221
ml={4}
221222
href={'https://github.com/canada-ca/tracker/issues'}

frontend/src/CreateUserPage.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import { fieldRequirements } from './fieldRequirements'
1616
import { TrackerButton } from './TrackerButton'
1717
import { LoadingMessage } from './LoadingMessage'
1818
import { activate } from './i18n.config'
19+
import { TermsConditionsPage } from './TermsConditionsPage'
1920

2021
export default function CreateUserPage() {
2122
const { login } = useUserState()
@@ -154,6 +155,10 @@ export default function CreateUserPage() {
154155

155156
<LanguageSelect name="lang" width="100%" mb="4" />
156157

158+
<Box overflow='scroll' height='20em' border="1px" borderColor="gray.200" p={4} m={4}>
159+
<TermsConditionsPage />
160+
</Box>
161+
157162
<Stack spacing={4} isInline justifyContent="space-between" mb="4">
158163
<TrackerButton
159164
as={RouteLink}

0 commit comments

Comments
 (0)