From fd546574ce4b0577ed4e78586ff3e5beab0c573c Mon Sep 17 00:00:00 2001 From: subinasr Date: Wed, 9 Oct 2024 12:04:05 +0545 Subject: [PATCH] Fix strings that do not need translations --- .changeset/quick-grapes-burn.md | 5 + app/src/App/routes/index.tsx | 2 +- app/src/components/GlobalFooter/index.tsx | 3 +- .../ConditionsModal/i18n.json | 6 +- .../ConditionsModal/index.tsx | 42 +- app/src/views/TermsAndConditions/i18n.json | 46 +- app/src/views/TermsAndConditions/index.tsx | 623 +++++++++--------- .../TermsAndConditions/styles.module.css | 24 +- 8 files changed, 355 insertions(+), 396 deletions(-) create mode 100644 .changeset/quick-grapes-burn.md diff --git a/.changeset/quick-grapes-burn.md b/.changeset/quick-grapes-burn.md new file mode 100644 index 0000000000..b79632cc56 --- /dev/null +++ b/.changeset/quick-grapes-burn.md @@ -0,0 +1,5 @@ +--- +"go-web-app": patch +--- + +Add Terms and Conditions page diff --git a/app/src/App/routes/index.tsx b/app/src/App/routes/index.tsx index 35c18582c8..d9f00e1af9 100644 --- a/app/src/App/routes/index.tsx +++ b/app/src/App/routes/index.tsx @@ -634,7 +634,7 @@ const termsAndConditions = customWrapRoute({ }, context: { title: 'Terms And Conditions', - visibility: 'is-authenticated', + visibility: 'anything', }, }); type DefaultAccountMyFormsChild = 'field-report'; diff --git a/app/src/components/GlobalFooter/index.tsx b/app/src/components/GlobalFooter/index.tsx index 7ed151b716..f8f3f5f985 100644 --- a/app/src/components/GlobalFooter/index.tsx +++ b/app/src/components/GlobalFooter/index.tsx @@ -108,8 +108,7 @@ function GlobalFooter(props: Props) { {strings.cookiePolicy} {strings.termsAndConditions} diff --git a/app/src/views/TermsAndConditions/ConditionsModal/i18n.json b/app/src/views/TermsAndConditions/ConditionsModal/i18n.json index 29e56f6237..885f41e0e3 100644 --- a/app/src/views/TermsAndConditions/ConditionsModal/i18n.json +++ b/app/src/views/TermsAndConditions/ConditionsModal/i18n.json @@ -1,5 +1,5 @@ { - "namespace": "ConditionsModal", + "namespace": "conditionsModal", "strings": { "hereConditionTitle": "Title", "srcDbCodeDescriptionOne": "EMDAT", @@ -11,7 +11,7 @@ "srcDbLabDescriptionTwo": "Disaster Inventory System (Desinventar)", "srcOrgCodeDescriptionTwo": "UNDRR", "srcOrgLabDescriptionTwo": "United Nations Disaster Risk Reduction (UNDRR)", - "srcOrgtypeCodeDescriptionTwo": "orgtypegov", + "srcOrgtypeCodeDescriptionTwo": "orgtypegov", "srcDbCodeDescriptionThree": "UNO_damass", "srcDbLabDescriptionThree": "UNOSAT Satellite Image-based Damage Assessment Data", "srcOrgCodeDescriptionThree": "UNOSAT", @@ -73,7 +73,7 @@ "srcOrgLabDescriptionFourteen": "European Commission - Joint Research Center", "srcOrgtypeCodeDescriptionFourteen": "orgtyperio", "srcDbCodeDescriptionFifteen": "GLIDE", - "srcDbLabDescriptionFifteen": "GLobal Identifier numbers (GLIDE)", + "srcDbLabDescriptionFifteen": "Global Identifier numbers (GLIDE)", "srcOrgCodeDescriptionFifteen": "ADRC", "srcOrgLabDescriptionFifteen": "Asian Disaster Reduction Center (ADRC)", "srcOrgtypeCodeDescriptionFifteen": "orgtyperio", diff --git a/app/src/views/TermsAndConditions/ConditionsModal/index.tsx b/app/src/views/TermsAndConditions/ConditionsModal/index.tsx index bf80aab5d3..e0e022b137 100644 --- a/app/src/views/TermsAndConditions/ConditionsModal/index.tsx +++ b/app/src/views/TermsAndConditions/ConditionsModal/index.tsx @@ -3,17 +3,14 @@ import { Modal, Table, } from '@ifrc-go/ui'; -import { SortContext } from '@ifrc-go/ui/contexts'; import { useTranslation } from '@ifrc-go/ui/hooks'; import { createStringColumn } from '@ifrc-go/ui/utils'; import { isDefined } from '@togglecorp/fujs'; -import useFilterState from '#hooks/useFilterState'; - import i18n from './i18n.json'; interface Props { - onCancel: () => void; + onClose: () => void; } interface TableData { @@ -28,22 +25,8 @@ const keySelector = (d: TableData) => d.id; function ConditionalModal(props: Props) { const strings = useTranslation(i18n); - const { - onCancel, - } = props; - const { - filtered, - sortState, - } = useFilterState<{ - srcDbCode?: string, - srcDbLab?: string, - srcOrgCode?: string - srcOrgLab?: string - srcOrgtypeCode?: string - }>({ - filter: {}, - }); + const { onClose } = props; const tableData: TableData[] = useMemo(() => [ { @@ -247,18 +230,17 @@ function ConditionalModal(props: Props) { return ( - - - +
); } diff --git a/app/src/views/TermsAndConditions/i18n.json b/app/src/views/TermsAndConditions/i18n.json index aadf94b7fb..ac4a4ce7a1 100644 --- a/app/src/views/TermsAndConditions/i18n.json +++ b/app/src/views/TermsAndConditions/i18n.json @@ -2,8 +2,8 @@ "namespace": "termsAndConditions", "strings": { "termsAndConditionTitle": "Terms and Conditions", - "termsAndConditionsDescription1": "The IFRC GO is a Red Cross Crescent platform that amis to connect information on emergency needs with the the right response. This goal is achieved by making sure that the information – or data – we use is both accurate and accessible. Better data enables the Movement to respond more effectively to the needs of disaster-affected people.", - "termsAndConditionsDescription2": "At present some data on the GO platform is visible to everyone. Access to certain National Society data requires registration and is restricted to the IFRC, ICRC, and the National Societies and is managed by IFRC.", + "termsAndConditionsDescription1": "The IFRC GO is a Red Cross Crescent platform that to connect information on emergency needs with the the right response. This goal is achieved by making sure that the information – or data – we use is both accurate and accessible. Better data enables the Movement to respond more effectively to the needs of disaster-affected people.", + "termsAndConditionsDescription2": "At present some data on the GO platform is visible to everyone. Access to certain National Society data requires registration and is restricted to the IFRC, ICRC, and the National Societies and is managed by IFRC.", "termsAndConditionsDescription3": "The Montandon is a public good with applications beyond IFRC. It contains information about natural hazards, their impacts, and what actions were taken when, where, by whom, and to what effect.", "dataProvenanceHeading": "DATA PROVENANCE", "dataProvenanceDescription": "GO and Montandon are composed of data collected and owned by IFRC and its network of National Societies. It also includes data from databases developed and maintained by our partners, such as the Global Internal Displacement Database, EM-DAT, and DesInventar, International Best Track Archive for Climate Stewardship, ShakeMap, and GDACS. GO and Montandon will always identify the data source.", @@ -11,9 +11,9 @@ "userRegistrationDescription": "Registration to this platform is open to staff, members and volunteers of the Red Cross Red Crescent Movement (National Societies, the IFRC and the ICRC) as well as to other responders, IFRC partners and authorised members of the public who agree to use the data and services for non-commercial purposes, such as research.", "userRegistrationDescriptionToLink": "To request access and register, please use {termsLink}.", "userRegistrationDescriptionLink": "this link", - "userRegistrationAuthorizedUser": "Authorized Uses ", + "userRegistrationAuthorizedUser": "Authorized Uses", "userRegistrationDescriptionByRegistering": "By registering as a user to this platform, you will be able to:", - "userRegistrationDescriptionList": "Information management -International Federation of Red Cross Crescent(IFRC).2024.Montandon - Global Crisis Data Bank:Revision 1.", + "userRegistrationDescriptionList": "Information management - International Federation of Red Cross Crescent(IFRC).2024.Montandon - Global Crisis Data Bank:Revision 1. ", "userRegistrationByLink": "{termsLink}. Accessed DAY MONTH YEAR.", "userRegistrationDescriptionList1": "Have free access to the database", "userRegistrationDescriptionList2": "Freely use of all published papers and technical reports from IFRC related to Montandon, provided the proper citation of Montandon and data obtained through it, which shall read as follow:", @@ -22,42 +22,42 @@ "userRegistrationDescription5": "Any use of the data outside of Montandon shall duly identify the data bank and the database owner.", "unAuthorisedUsesHeading": "UNAUTHORISED USES", "unAuthorisedUsesDescription": "By registering as a user, you commit to not", - "unAuthorisedUsesDescriptionList1": "Reproduce,copy,communicate,lend or otherwise distribute the data bank or a substantial part of data bank.", + "unAuthorisedUsesDescriptionList1": "Reproduce, copy, communicate, lend or otherwise distribute the data bank or a substantial part of data bank.", "unAuthorisedUsesDescriptionList2": "Reverse assemble, decompile, decompose, or disassemble Montandon.", "unAuthorisedUsesDescriptionList3": "Create Substitute or derivative databases of Montandon.", - "unAuthorisedUsesDescriptionList4": "Attempt to unlock or bypass any initialization or security system used by Montandon.", - "unAuthorisedUsesDescriptionList5": "Share, use or transmit any portion of Montandon via the Internet to unauthorised users,", - "unAuthorisedUsesDescriptionList6": "Divulge the password or share access tokens to unauthorised users.", + "unAuthorisedUsesDescriptionList4": "Attempt to unlock or bypass any initialization or security system used by Montandon.", + "unAuthorisedUsesDescriptionList5": "Share, use or transmit any portion of Montandon via the Internet to unauthorised users.", + "unAuthorisedUsesDescriptionList6": "Divulge the password or share access tokens to unauthorised users.", "unAuthorisedUsesDescriptionList7": "Remove, alter or obscure any proprietary legend, copyright, trademark, or other intellectual property right notice, logo, and image in or on Montandon.", - "unAuthorisedUsesDescriptionList8": "Perform acts that conflict with the normal exploitation of Montandon or unreasonable prejudice the interests of IFRC and/or data owner.", + "unAuthorisedUsesDescriptionList8": "Perform acts that conflict with the normal exploitation of Montandon or unreasonable prejudice the interests of IFRC and/or data owner.", "unAuthorisedUsesDescriptionList9": "Use the platform and contents in any way that may cause unjustified damage to the legitimate interests of IFRC and/or public image of IFRC or its database partners.", - "unAuthorisedUsesDescriptionList10": "Use the platform with the aim of creating a tool in competition with Montandon.", - "unAuthorisedUsesDescription2": "In any case, as a user to this platform,you commit to not use the data available for any commercial use, unless entered into a separate agreement with the data owner.", - "unAuthorisedUsesDescription3": "Any reproduction or representation, whether in full or in part,for unauthorised purposes in prohibited.Failure to comply with this provision will constitute a breach of these terms and may incur the infringer's liability.", + "unAuthorisedUsesDescriptionList10": "Use the platform with the aim of creating a tool in competition with Montandon.", + "unAuthorisedUsesDescription2": "In any case, as a user to this platform, you commit to not use the data available for any commercial use, unless entered into a separate agreement with the data owner.", + "unAuthorisedUsesDescription3": "Any reproduction or representation, whether in full or in part, for unauthorised purposes in prohibited.Failure to comply with this provision will constitute a breach of these terms and may incur the infringer's liability.", "complianceDateOwnerHeading": "COMPLIANCE WITH ANY APPLICABLE CONDITIONS FROM DATA OWNER", - "complianceDateOwnerDescription1": "When reusing any data available in the Montandon database, it is user's responsibility to comply with any applicable terms of use or other conditions established by the data owner", - "complianceDateOwnerDescription2": "To facilitate when the data owner is not IFRC,IFRC makes the applicable terms of use from data source available {termsLink} and will, to the extent possible, keep it updated.", + "complianceDateOwnerDescription1": "When reusing any data available in the Montandon database, it is user's responsibility to comply with any applicable terms of use or other conditions established by the data owner", + "complianceDateOwnerDescription2": "To facilitate when the data owner is not IFRC, IFRC makes the applicable terms of use from data source available {termsLink} and will, to the extent possible, keep it updated.", "complianceDateOwnerDescription2Link": "here", - "complianceDateOwnerDescription3": "If unsure of rge applicable terms, you may contact IFRC at {termsLink} and IFRC can help liaise with the data owner.", - "complianceDateOwnerDescription4": "Nonetheless,the obligation is still on the user to ensure compliance with the most recent and applicable terms of use required from the data source.", + "complianceDateOwnerDescription3": "If unsure of the applicable terms, you may contact IFRC at {termsLink} and IFRC can help liaise with the data owner.", + "complianceDateOwnerDescription4": "Nonetheless, the obligation is still on the user to ensure compliance with the most recent and applicable terms of use required from the data source.", "complianceDateOwnerDescription5": "Please not that, if you are not an academic, humanitarian or non-profit organization, different conditions may be applicable to your reuse of a dataset, as determined by the data owner.", "liabilityOfIFRCHeading": "LIABILITY OF IFRC", - "liabilityOfIFRCDescription": "To the extent reasonably possible ,IFRC tries to ensure the data displayed (insert the criteria of relevance and quality used for the data contained in the database and any measures token ti insure ):", + "liabilityOfIFRCDescription": "To the extent reasonably possible, IFRC tries to ensure the data displayed (insert the criteria of relevance and quality used for the data contained in the database and any measures taken to ensure):", "liabilityOfIFRCDescriptionList1": "Does not contain any personal or non-personal sensitive data", "liabilityOfIFRCDescriptionList2": "Is accurate and most updated", "liabilityOfIFRCDescriptionList3": "Is open and complies with the", "liabilityOfIFRCDescription3Link": "FAIR Principles", - "liabilityOfIFRCDescriptionList4": "Includes link to original data sources and metadata, as well as links to explanations for how the data has been treated,transformed,analysed and visualised", - "liabilityOfIFRCDescriptionList5": "Conforms to internationally recognized standards with regard to rhe names and definitions of indicators, hazard definitions and hazard intensities", + "liabilityOfIFRCDescriptionList4": "Includes link to original data sources and metadata, as well as links to explanations for how the data has been treated, transformed, analysed and visualised", + "liabilityOfIFRCDescriptionList5": "Conforms to internationally recognized standards with regard to the names and definitions of indicators, hazard definitions and hazard intensities", "liabilityOfIFRCDescription2": "Despite IFRC's best efforts, IFRC makes no representation or warranty that (i) and the data available will meet your needs,(ii) the service will be uninterrupted,punctual,secure or error-free,(iii) the data available and results obtained by using the platform will be accurate or reliable, or that (iv) any error of content will be corrected.", "liabilityOfIFRCDescription3": "Any part of the content may be obsolete at any time without the IFRC being in any way bound to update this content.", - "liabilityOfIFRCDescription4": "IFRC is not liable for any direct, consequential, incidental, particular or resulting damage,nor any punitive damages resulting from the use of the platform or the impossibility of using it or any other issue relating to the platform.", + "liabilityOfIFRCDescription4": "IFRC is not liable for any direct, consequential, incidental, particular or resulting damage,nor any punitive damages resulting from the use of the platform or the impossibility of using it or any other issue relating to the platform.", "liabilityOfIFRCDescription5": "The IFRC reserves the right to alter or shut down the platform(ir any part of it) temporarily or for good, with or without notice.IFRC shall not be answerable to you or to any third part for any alteration to or suspension or cessation of the platform.", "protectionUsersPersonalDataHeading": "PROTECTION OF USER'S PERSONAL DATA", - "protectionUsersPersonalDataDescription": "The personal data required for registration will be used by IFRC only for the purposes of ", + "protectionUsersPersonalDataDescription": "The personal data required for registration will be used by IFRC only for the purposes of ", "protectionUsersPersonalDataDescriptionList1": "Validating your registration", "protectionUsersPersonalDataDescriptionList2": "Providing access to the platform", - "protectionUsersPersonalDataDescriptionList3": "Providing information or any necessary communication regarding the platform(e.g.,a survey to assess how to improve the platform and better serve user's needs and provide a better experience for users)", + "protectionUsersPersonalDataDescriptionList3": "Providing information or any necessary communication regarding the platform (e.g.,a survey to assess how to improve the platform and better serve user's needs and provide a better experience for users)", "protectionUsersPersonalDataDescriptionList4": "Providing aggregated metrics to partners so that they know how many people have viewed,accessed or downloaded their data via GO/Montandon", "protectionUsersPersonalDataDescription2": "IFRC will not share your personal data. Any usage statistics reports shared with partners will not contain any personal data of users. If you no longer wish to be a user, you may request at any time that we delete your account by e-mail us at {termsLink}.", "protectionUsersPersonalDataDescription3": "IFRC will process and protect your personal data in accordance with its {termsLink}", @@ -69,7 +69,7 @@ "finalProvisionsHeading": "FINAL PROVISIONS", "finalProvisionsDescription1": "The IFRC reserves the right to amend or change these Terms at any time, at its sole discretion. You should consult them regularly to keep yourself informed of any changes.", "finalProvisionsDescription2": "Any violation of these Terms may result in a temporary ban from the platform, and, where necessary, additional actions may be taken to address violations of these Terms.", - "finalProvisionsDescription3":"For more information on the database, its uses, data sources, limitations and peculiarities for data analaysis ot other related matters, please contact IFRC at {termsLink}", + "finalProvisionsDescription3":"For more information on the database, its uses, data sources, limitations and peculiarities for data analysis ot other related matters, please contact IFRC at {termsLink}", "finalProvisionsDescription4": "You are not obligated to register to this platform; but, by doing so, you understand and agree to the terms of use." } } diff --git a/app/src/views/TermsAndConditions/index.tsx b/app/src/views/TermsAndConditions/index.tsx index 5e67543d8d..6bcfb57519 100644 --- a/app/src/views/TermsAndConditions/index.tsx +++ b/app/src/views/TermsAndConditions/index.tsx @@ -22,14 +22,17 @@ import ConditionsModal from './ConditionsModal'; import i18n from './i18n.json'; import styles from './styles.module.css'; +type TitlesOptionKey = 'data-provenance' | 'user-registration' | 'unauthorised-users'| 'compliance-of-user-owner' | 'liability-of-ifrc' | 'protection-personal-data' | 'privileges-and-immunities' | 'final-provisions'; + // eslint-disable-next-line import/prefer-default-export export function Component() { const strings = useTranslation(i18n); + const [showHereConditionModal, { setTrue: setShowHereModalTrue, setFalse: setShowHereModalFalse, }] = useBooleanState(false); - type TitlesOptionKey = 'data-provenance' | 'user-registration' | 'unauthorised-users'| 'compliance-of-user-owner' | 'liability-of-ifrc' | 'protection-personal-data' | 'privileges-and-immunities' | 'final-provisions'; + const [activeTitlesOption, setActiveTitleOption] = useState('data-provenance'); const dataProvenanceRef = useRef(null); @@ -60,351 +63,325 @@ export function Component() { return ( -
- + - - - {strings.dataProvenanceHeading} - - - {strings.userRegistrationHeading} - - - {strings.unAuthorisedUsesHeading } - - - {strings.complianceDateOwnerHeading} - - - {strings.liabilityOfIFRCHeading } - - - {strings.protectionUsersPersonalDataHeading} - - - {strings.privilegesAndImmunitiesHeading} - - - {strings.finalProvisionsHeading} - - - + + {strings.dataProvenanceHeading} + + + {strings.userRegistrationHeading} + + + {strings.unAuthorisedUsesHeading } + + + {strings.complianceDateOwnerHeading} + + + {strings.liabilityOfIFRCHeading } + + + {strings.protectionUsersPersonalDataHeading} + + + {strings.privilegesAndImmunitiesHeading} + + + {strings.finalProvisionsHeading} + + + + -
{strings.termsAndConditionsDescription1}
-
{strings.termsAndConditionsDescription2}
-
{strings.termsAndConditionsDescription3}
- - )} + contentViewType="vertical" > - {strings.dataProvenanceDescription}
- } - containerRef={dataProvenanceRef} - /> - -
{strings.userRegistrationDescription}
-
- {resolveToComponent( - strings.userRegistrationDescriptionToLink, - { - termsLink: ( - - {strings.userRegistrationDescriptionLink} - - ), - }, - )} -
-
- {strings.userRegistrationAuthorizedUser} - -
-
{strings.userRegistrationDescriptionByRegistering}
-
    -
  • - {strings.userRegistrationDescriptionList1} -
    • -
  • - {strings.userRegistrationDescriptionList2} -
      -
    • - {strings.userRegistrationDescriptionList} -

      - { resolveToComponent( - strings.userRegistrationByLink, - { - termsLink: ( - - http://montandon.westeurope.cloudapp.azure.com:8000/__docs__/ - - ), - }, - )} -

      -
      • -
    -
    • -
  • {strings.userRegistrationDescriptionList3}
    • -
  • {strings.userRegistrationDescriptionList4}
    • -
-
{strings.userRegistrationDescription5}
- - )} - /> - -

{strings.unAuthorisedUsesDescription}

-
    -
  • {strings.unAuthorisedUsesDescriptionList1}
    • -
  • {strings.unAuthorisedUsesDescriptionList2}
    • -
  • {strings.unAuthorisedUsesDescriptionList3}
    • -
  • {strings.unAuthorisedUsesDescriptionList4}
    • -
  • {strings.unAuthorisedUsesDescriptionList5}
    • -
  • {strings.unAuthorisedUsesDescriptionList6}
    • -
  • {strings.unAuthorisedUsesDescriptionList7}
    • -
  • {strings.unAuthorisedUsesDescriptionList8}
    • -
  • {strings.unAuthorisedUsesDescriptionList9}
    • -
  • {strings.unAuthorisedUsesDescriptionList10}
    • -
-

{strings.unAuthorisedUsesDescription2}

-

{strings.unAuthorisedUsesDescription3}

- - )} - /> - -

{strings.complianceDateOwnerDescription1}

-

- {resolveToComponent( - strings.complianceDateOwnerDescription2, - { - termsLink: ( - - {strings.complianceDateOwnerDescription2Link} - - ), - }, - )} - {showHereConditionModal && ( - - )} -

-

- {resolveToComponent( - strings.complianceDateOwnerDescription3, - { - termsLink: ( - - IM@ifrc.org - - ), - }, - )} -

-

{strings.complianceDateOwnerDescription4}

-

{strings.complianceDateOwnerDescription5}

- +
{strings.termsAndConditionsDescription1}
+
{strings.termsAndConditionsDescription2}
+
{strings.termsAndConditionsDescription3}
+ + + {strings.dataProvenanceDescription} + + +
{strings.userRegistrationDescription}
+
+ {resolveToComponent( + strings.userRegistrationDescriptionToLink, + { + termsLink: ( + + {strings.userRegistrationDescriptionLink} + + ), + }, )} - /> - -

{strings.liabilityOfIFRCDescription}

-
    -
  • {strings.liabilityOfIFRCDescriptionList1}
    • -
  • {strings.liabilityOfIFRCDescriptionList2}
    • -
  • +
+
+ {strings.userRegistrationAuthorizedUser} + +
+
{strings.userRegistrationDescriptionByRegistering}
+
    +
  • + {strings.userRegistrationDescriptionList1} +
    • +
  • + {strings.userRegistrationDescriptionList2} +
      +
    • + {strings.userRegistrationDescriptionList} +

      { resolveToComponent( - strings.liabilityOfIFRCDescriptionList3, + strings.userRegistrationByLink, { termsLink: ( - {strings.liabilityOfIFRCDescription3Link} - + http://montandon.westeurope.cloudapp.azure.com:8000/__docs__/ ), }, )} -

      • -
    • {strings.liabilityOfIFRCDescriptionList4}
      • -
    • {strings.liabilityOfIFRCDescriptionList5}
      • -
    -

    {strings.liabilityOfIFRCDescription2}

    -

    {strings.liabilityOfIFRCDescription3}

    -

    {strings.liabilityOfIFRCDescription4}

    -

    {strings.liabilityOfIFRCDescription5}

    - +

    +
    • +
+ +
  • {strings.userRegistrationDescriptionList3}
    • +
  • {strings.userRegistrationDescriptionList4}
    • + +
    {strings.userRegistrationDescription5}
    +     + +

    {strings.unAuthorisedUsesDescription}

    +
      +
    • {strings.unAuthorisedUsesDescriptionList1}
      • +
    • {strings.unAuthorisedUsesDescriptionList2}
      • +
    • {strings.unAuthorisedUsesDescriptionList3}
      • +
    • {strings.unAuthorisedUsesDescriptionList4}
      • +
    • {strings.unAuthorisedUsesDescriptionList5}
      • +
    • {strings.unAuthorisedUsesDescriptionList6}
      • +
    • {strings.unAuthorisedUsesDescriptionList7}
      • +
    • {strings.unAuthorisedUsesDescriptionList8}
      • +
    • {strings.unAuthorisedUsesDescriptionList9}
      • +
    • {strings.unAuthorisedUsesDescriptionList10}
      • +
    +

    {strings.unAuthorisedUsesDescription2}

    +

    {strings.unAuthorisedUsesDescription3}

    +     + +

    {strings.complianceDateOwnerDescription1}

    +

    + {resolveToComponent( + strings.complianceDateOwnerDescription2, + { + termsLink: ( + + {strings.complianceDateOwnerDescription2Link} + + ), + }, )} - /> - -

    {strings.protectionUsersPersonalDataDescription}

    -
      -
    • {strings.protectionUsersPersonalDataDescriptionList1}
      • -
    • {strings.protectionUsersPersonalDataDescriptionList2}
      • -
    • {strings.protectionUsersPersonalDataDescriptionList3}
      • -
    • {strings.protectionUsersPersonalDataDescriptionList4}
      • -
    -

    - {resolveToComponent( - strings.protectionUsersPersonalDataDescription2, - { - termsLink: ( - - IM@ifrc.org - - ), - }, - )} -

    -

    - {resolveToComponent( - strings.protectionUsersPersonalDataDescription3, - { - termsLink: ( - - {strings.protectionUsersPersonalDataLink3} + {showHereConditionModal && ( + + )} +

    +

    + {resolveToComponent( + strings.complianceDateOwnerDescription3, + { + termsLink: ( + + IM@ifrc.org + + ), + }, + )} +

    +

    {strings.complianceDateOwnerDescription4}

    +

    {strings.complianceDateOwnerDescription5}

    +     + +

    {strings.liabilityOfIFRCDescription}

    +
      +
    • {strings.liabilityOfIFRCDescriptionList1}
      • +
    • {strings.liabilityOfIFRCDescriptionList2}
      • +
    • + { resolveToComponent( + strings.liabilityOfIFRCDescriptionList3, + { + termsLink: ( + + {strings.liabilityOfIFRCDescription3Link} - - ), - }, - )} -

      + + ), + }, + )} +
      • +
    • {strings.liabilityOfIFRCDescriptionList4}
      • +
    • {strings.liabilityOfIFRCDescriptionList5}
      • +
    +

    {strings.liabilityOfIFRCDescription2}

    +

    {strings.liabilityOfIFRCDescription3}

    +

    {strings.liabilityOfIFRCDescription4}

    +

    {strings.liabilityOfIFRCDescription5}

    +     + +

    {strings.protectionUsersPersonalDataDescription}

    +
      +
    • {strings.protectionUsersPersonalDataDescriptionList1}
      • +
    • {strings.protectionUsersPersonalDataDescriptionList2}
      • +
    • {strings.protectionUsersPersonalDataDescriptionList3}
      • +
    • {strings.protectionUsersPersonalDataDescriptionList4}
      • +
    +

    + {resolveToComponent( + strings.protectionUsersPersonalDataDescription2, + { + termsLink: ( + {strings.protectionUsersPersonalDataDescription4}

    -

    - {resolveToComponent( - strings.protectionUsersPersonalDataDescription5, - { - termsLink: ( - + IM@ifrc.org + + ), + }, + )} +

    +

    + {resolveToComponent( + strings.protectionUsersPersonalDataDescription3, + { + termsLink: ( + + {strings.protectionUsersPersonalDataLink3} - > - IM@ifrc.org - - ), - }, - )} -

    - + + ), + }, )} - /> - - {strings.privilegesAndImmunitiesDescription} - +

    + +

    {strings.protectionUsersPersonalDataDescription4}

    +

    + {resolveToComponent( + strings.protectionUsersPersonalDataDescription5, + { + termsLink: ( + + IM@ifrc.org + + ), + }, )} - /> - -

    {strings.finalProvisionsDescription1}

    -

    {strings.finalProvisionsDescription2}

    -

    - {resolveToComponent( - strings.finalProvisionsDescription3, - { - termsLink: ( - - IM@ifrc.org - - ), - }, - )} -

    -

    {strings.finalProvisionsDescription4}

    - +

    +     + + {strings.privilegesAndImmunitiesDescription} + + +

    {strings.finalProvisionsDescription1}

    +

    {strings.finalProvisionsDescription2}

    +

    + {resolveToComponent( + strings.finalProvisionsDescription3, + { + termsLink: ( + + IM@ifrc.org + + ), + }, )} - /> +

    +

    {strings.finalProvisionsDescription4}

     - +     ); } diff --git a/app/src/views/TermsAndConditions/styles.module.css b/app/src/views/TermsAndConditions/styles.module.css index 7e27a283cf..bbf7af6827 100644 --- a/app/src/views/TermsAndConditions/styles.module.css +++ b/app/src/views/TermsAndConditions/styles.module.css @@ -1,15 +1,11 @@ -.terms-wrapper{ - display: flex; -} -.aside-titles{ - display: flex; - flex-direction: column; - padding: var(--go-ui-spacing-sm); - gap: var(--go-ui-spacing-xl); -} -.header-description { - display: flex; - flex-direction: column; - gap: var(--go-ui-spacing-md); - } +.terms-and-conditions { + .main-section { + display: flex; + gap: var(--go-ui-spacing-xl); + .side-titles { + flex-shrink: 0; + max-width: 16rem; + } + } +}