Skip to content

Commit

Permalink
Merge branch 'dev' into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
shewood committed Jul 2, 2024
2 parents fddcb15 + 788f3d0 commit 6ba368f
Show file tree
Hide file tree
Showing 16 changed files with 395 additions and 2,896 deletions.
8 changes: 8 additions & 0 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@

change-template: '- $TITLE @$AUTHOR (#$NUMBER)'

template: |
## Changes
$CHANGES
24 changes: 24 additions & 0 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Release Drafter

on:
push:
branches:
- main
workflow_dispatch:

jobs:
update_release_draft:
runs-on: ubuntu-latest
permissions:
# Write permission is required to create a github release
contents: write
# Write permission is required for autolabeler
pull-requests: write
steps:
- uses: release-drafter/release-drafter@v6
with:
name: next
tag: next
version: next
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
13 changes: 0 additions & 13 deletions .github/workflows/release-please.yml

This file was deleted.

3 changes: 3 additions & 0 deletions __mocks__/utils.mock.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
import { TextEncoder, TextDecoder } from 'util'

Object.assign(global, { TextDecoder, TextEncoder })

// for testing locally comment.
// process.env.AUTH_DISABLED= "true"
106 changes: 0 additions & 106 deletions __tests__/pages/privacy-notice-terms-conditions.test.js

This file was deleted.

57 changes: 39 additions & 18 deletions components/Layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -147,24 +147,45 @@ export default function Layout(props) {

<IdleTimeout locale={props.locale} refPageAA={props.refPageAA} />

<Footer
lang={!props.locale ? 'en' : props.locale}
brandLinks={[
{
href: t.footerTermsAndConditionURL,
id: 'linkTC',
text: t.footerTermsAndCondition,
},
{
href: t.footerPrivacyURL,
id: 'linkPR',
text: t.footerPrivacy,
},
]}
contactLink={contactLink}
btnLink="#top"
id="page-footer"
/>
{process.env.ENVIRONMENT === 'production' ? (
<Footer
lang={!props.locale ? 'en' : props.locale}
brandLinks={[
{
href: t.footerTermsAndConditionURL,
id: 'linkTC',
text: t.footerTermsAndCondition,
},
{
href: t.footerPrivacyURL,
id: 'linkPR',
text: t.footerPrivacy,
},
]}
contactLink={contactLink}
btnLink="#top"
id="page-footer"
/>
) : (
<Footer
lang={!props.locale ? 'en' : props.locale}
brandLinks={[
{
href: t.footerTermsAndConditionDevURL,
id: 'linkTC',
text: t.footerTermsAndCondition,
},
{
href: t.footerPrivacyDevURL,
id: 'linkPR',
text: t.footerPrivacy,
},
]}
contactLink={contactLink}
btnLink="#top"
id="page-footer"
/>
)}
</>
)
}
Expand Down
80 changes: 0 additions & 80 deletions cypress/e2e/termsConditions.cy.js

This file was deleted.

Loading

0 comments on commit 6ba368f

Please sign in to comment.