Skip to content

Commit a69cd36

Browse files
authored
Merge pull request #1324 from IFRCGo/feature/riskmodule-terms-conditions
Add Terms And Conditions Page
2 parents 5c71526 + fd54657 commit a69cd36

File tree

9 files changed

+848
-4
lines changed

9 files changed

+848
-4
lines changed

.changeset/quick-grapes-burn.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"go-web-app": patch
3+
---
4+
5+
Add Terms and Conditions page

app/src/App/routes/index.tsx

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -625,6 +625,18 @@ const accountDetails = customWrapRoute({
625625
},
626626
});
627627

628+
const termsAndConditions = customWrapRoute({
629+
parent: rootLayout,
630+
path: 'terms-and-conditions',
631+
component: {
632+
render: () => import('#views/TermsAndConditions'),
633+
props: {},
634+
},
635+
context: {
636+
title: 'Terms And Conditions',
637+
visibility: 'anything',
638+
},
639+
});
628640
type DefaultAccountMyFormsChild = 'field-report';
629641
const accountMyFormsLayout = customWrapRoute({
630642
parent: accountLayout,
@@ -1258,6 +1270,7 @@ const wrappedRoutes = {
12581270
perPrioritizationForm,
12591271
perWorkPlanForm,
12601272
threeWProjectDetail,
1273+
termsAndConditions,
12611274
// TODO: unhide operational learning
12621275
// operationalLearning,
12631276
...regionRoutes,

app/src/components/GlobalFooter/index.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,7 @@ function GlobalFooter(props: Props) {
108108
{strings.cookiePolicy}
109109
</Link>
110110
<Link
111-
// FIXME: Add termsAndConditions link after the page is created
112-
to="cookiePolicy"
111+
to="termsAndConditions"
113112
>
114113
{strings.termsAndConditions}
115114
</Link>

app/src/views/AccountDetails/GenerateMontandonTokenModal/index.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ function GenerateMontandonTokenModal(props: Props) {
7575
{
7676
termsLink: (
7777
<Link
78-
external
79-
href="https://docs.google.com/spreadsheets/d/1kQZQmWk8W4tyE3fhi54Oc2Q-TiLJVUj0/"
78+
to="termsAndConditions"
8079
withLinkIcon
8180
withUnderline
8281
>
Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
{
2+
"namespace": "conditionsModal",
3+
"strings": {
4+
"hereConditionTitle": "Title",
5+
"srcDbCodeDescriptionOne": "EMDAT",
6+
"srcDbLabDescriptionOne": "Emergency Events Database",
7+
"srcOrgCodeDescriptionOne": "CRED",
8+
"srcOrgLabDescriptionOne": "Centre for Research on the Epidemiology of Disasters (CRED) University of Louvain",
9+
"srcOrgtypeCodeDescriptionOne": "orgtypeacad",
10+
"srcDbCodeDescriptionTwo": "Desinventar",
11+
"srcDbLabDescriptionTwo": "Disaster Inventory System (Desinventar)",
12+
"srcOrgCodeDescriptionTwo": "UNDRR",
13+
"srcOrgLabDescriptionTwo": "United Nations Disaster Risk Reduction (UNDRR)",
14+
"srcOrgtypeCodeDescriptionTwo": "orgtypegov",
15+
"srcDbCodeDescriptionThree": "UNO_damass",
16+
"srcDbLabDescriptionThree": "UNOSAT Satellite Image-based Damage Assessment Data",
17+
"srcOrgCodeDescriptionThree": "UNOSAT",
18+
"srcOrgLabDescriptionThree": "United Nations Satellite Centre (UNOSAT)",
19+
"srcOrgtypeCodeDescriptionThree": "orgtypeun",
20+
"srcDbCodeDescriptionFour": "COP_damass",
21+
"srcDbLabDescriptionFour": "Copernicus EMS Satellite Image-based Damage Assessment Data",
22+
"srcOrgCodeDescriptionFour": "COPERNICUS",
23+
"srcOrgLabDescriptionFour": "Copernicus Emergency Management Services (EMS)",
24+
"srcOrgtypeCodeDescriptionFour": "orgtyperio",
25+
"srcDbCodeDescriptionFive": "GO-EA",
26+
"srcDbLabDescriptionFive": "IFRC Emergency Appeals (EA)",
27+
"srcOrgCodeDescriptionFive": "IFRC",
28+
"srcOrgLabDescriptionFive": "International Federation of Red Cross Red Crescent Societies (IFRC)",
29+
"srcOrgtypeCodeDescriptionFive": "orgtypepengo",
30+
"srcDbCodeDescriptionSix": "GO-DREF",
31+
"srcDbLabDescriptionSix": "IFRC Disaster Response Emergency Funding (DREF)",
32+
"srcOrgCodeDescriptionSix": "IFRC",
33+
"srcOrgLabDescriptionSix": "International Federation of Red Cross Red Crescent Societies (IFRC)",
34+
"srcOrgtypeCodeDescriptionSix": "orgtypepengo",
35+
"srcDbCodeDescriptionSeven": "GO-FBA",
36+
"srcDbLabDescriptionSeven": "IFRC Forecast Based Action",
37+
"srcOrgCodeDescriptionSeven": "IFRC",
38+
"srcOrgLabDescriptionSeven": "International Federation of Red Cross Red Crescent Societies (IFRC)",
39+
"srcOrgtypeCodeDescriptionSeven": "orgtypepengo",
40+
"srcDbCodeDescriptionEight": "GO-EAP",
41+
"srcDbLabDescriptionEight": "IFRC Emergency Action Protocol Funding (EAP)",
42+
"srcOrgCodeDescriptionEight": "IFRC",
43+
"srcOrgLabDescriptionEight": "International Federation of Red Cross Red Crescent Societies (IFRC)",
44+
"srcOrgtypeCodeDescriptionEight": "orgtypepengo",
45+
"srcDbCodeDescriptionNine": "GO-sEAP",
46+
"srcDbLabDescriptionNine": "IFRC simplified Emergency Action Protocol Funding (sEAP)",
47+
"srcOrgCodeDescriptionNine": "IFRC",
48+
"srcOrgLabDescriptionNine": "International Federation of Red Cross Red Crescent Societies (IFRC)",
49+
"srcOrgtypeCodeDescriptionNine": "orgtypepengo",
50+
"srcDbCodeDescriptionTen": "GO-AA",
51+
"srcDbLabDescriptionTen": "IFRC Anticipatory Actions(AA)",
52+
"srcOrgCodeDescriptionTen": "IFRC",
53+
"srcOrgLabDescriptionTen": "International Federation of Red Cross Red Crescent Societies (IFRC)",
54+
"srcOrgtypeCodeDescriptionTen": "orgtypepengo",
55+
"srcDbCodeDescriptionEleven": "GO-iDREF",
56+
"srcDbLabDescriptionEleven": "IFRC Imminent Disaster response Emergency Funding(iDREF)",
57+
"srcOrgCodeDescriptionEleven": "IFRC",
58+
"srcOrgLabDescriptionEleven": "International Federation of Red Cross Red Crescent Societies (IFRC)",
59+
"srcOrgtypeCodeDescriptionEleven": "orgtypepengo",
60+
"srcDbCodeDescriptionTwelve": "GO-FR",
61+
"srcDbLabDescriptionTwelve": "IFRC Field Reports (FR)",
62+
"srcOrgCodeDescriptionTwelve": "IFRC",
63+
"srcOrgLabDescriptionTwelve": "International Federation of Red Cross Red Crescent Societies (IFRC)",
64+
"srcOrgtypeCodeDescriptionTwelve": "orgtypepengo",
65+
"srcDbCodeDescriptionThirteen": "GIDD",
66+
"srcDbLabDescriptionThirteen": "Global Internal Displacement Database (GIDD)",
67+
"srcOrgCodeDescriptionThirteen": "IDMC",
68+
"srcOrgLabDescriptionThirteen": "Internal Monitoring Displacement Centre (IDMC)",
69+
"srcOrgtypeCodeDescriptionThirteen": "orgtypepengo",
70+
"srcDbCodeDescriptionFourteen": "GDACS",
71+
"srcDbLabDescriptionFourteen": "Global Disaster Alert and Coordination System (GDACS)",
72+
"srcOrgCodeDescriptionFourteen": "EC-JRC",
73+
"srcOrgLabDescriptionFourteen": "European Commission - Joint Research Center",
74+
"srcOrgtypeCodeDescriptionFourteen": "orgtyperio",
75+
"srcDbCodeDescriptionFifteen": "GLIDE",
76+
"srcDbLabDescriptionFifteen": "Global Identifier numbers (GLIDE)",
77+
"srcOrgCodeDescriptionFifteen": "ADRC",
78+
"srcOrgLabDescriptionFifteen": "Asian Disaster Reduction Center (ADRC)",
79+
"srcOrgtypeCodeDescriptionFifteen": "orgtyperio",
80+
"srcDbCodeDescriptionSixteen": "GO-Maps",
81+
"srcDbLabDescriptionSixteen": "IFRC-GO ADM-0 Maps",
82+
"srcOrgCodeDescriptionSixteen": "IFRC",
83+
"srcOrgLabDescriptionSixteen": "International Federation of Red Cross Red Crescent Societies (IFRC)",
84+
"srcOrgtypeCodeDescriptionSixteen": "orgtypepengo",
85+
"srcDbCodeDescriptionSeventeen": "Atlas",
86+
"srcDbLabDescriptionSeventeen": "Atlas Earthquake ShakeMap Catalog",
87+
"srcOrgCodeDescriptionSeventeen": "USGS",
88+
"srcOrgLabDescriptionSeventeen": "United States Geological Survey (USGS)",
89+
"srcOrgtypeCodeDescriptionSeventeen": "orgtypegov",
90+
"srcDbCodeDescriptionEighteen": "GAUL",
91+
"srcDbLabDescriptionEighteen": "Global Administrative Unit Layers (GAUL)",
92+
"srcOrgCodeDescriptionEighteen": "FAO",
93+
"srcOrgLabDescriptionEighteen": "Food and Agriculture Organization",
94+
"srcOrgtypeCodeDescriptionEighteen": "orgtypegov",
95+
"srcDbCodeDescriptionNineteen": "GovDes",
96+
"srcDbLabDescriptionNineteen": "Official Government or UN ADM Boundaries",
97+
"srcOrgCodeDescriptionNineteen": "UNDRR",
98+
"srcOrgLabDescriptionNineteen": "United Nations Disaster Risk Reduction (UNDRR)",
99+
"srcOrgtypeCodeDescriptionNineteen": "orgtypegov",
100+
"srcDbCodeDescriptionTwenty": "DFO",
101+
"srcDbLabDescriptionTwenty": "Dartmouth Flood Observatory (DFO)",
102+
"srcOrgCodeDescriptionTwenty": "UniColumbia",
103+
"srcOrgLabDescriptionTwenty": "University of Columbia",
104+
"srcOrgtypeCodeDescriptionTwenty": "orgtypeacad"
105+
}
106+
}

0 commit comments

Comments
 (0)