From 573cccee4bd9e1f878fefde1dfc9fb3fe9be492c Mon Sep 17 00:00:00 2001 From: Madhav Kumar Date: Thu, 5 Nov 2020 23:59:43 +1000 Subject: [PATCH 1/2] Add new templates for committee --- src/constants.ts | 230 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 221 insertions(+), 9 deletions(-) diff --git a/src/constants.ts b/src/constants.ts index 436d7fe8..f37c2df1 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -313,12 +313,19 @@ interface TemplateMember { export enum CommitteeTemplate { AfricanUnion = 'African Union', + ASEAN = 'Association of Southeast Asian Nations', + BRICS = 'BRICS', + EU = 'European Union', G20 = 'G20', + NATO = 'North Atlantic Treaty Organization', SecurityCouncil = 'UN Security Council', + UNHRC = 'UN Human Rights Council', + UNICEF = 'UN Children\'s Fund', + WHOHealthBoard = 'WHO Health Board', } export const TEMPLATE_TO_MEMBERS: Record = { - 'African Union': [ + [CommitteeTemplate.AfricanUnion]: [ { name: 'Algeria' }, { name: 'Angola' }, { name: 'Benin' }, @@ -367,6 +374,110 @@ export const TEMPLATE_TO_MEMBERS: Record = { name: 'Zambia' }, { name: 'Zimbabwe'} ], + [CommitteeTemplate.ASEAN]: [ + { name: 'Brunei' }, + { name: 'Cambodia' }, + { name: 'Indonesia' }, + { name: 'Laos' }, + { name: 'Malaysia' }, + { name: 'Myanmar' }, + { name: 'Philippines' }, + { name: 'Singapore' }, + { name: 'Thailand' }, + { name: 'Vietnam' } + ], + [CommitteeTemplate.BRICS]: [ + { name: 'Brazil' }, + { name: 'China' }, + { name: 'India' }, + { name: 'Russia' }, + { name: 'South Africa' } + ], + [CommitteeTemplate.EU]: [ + { name: 'Austria' }, + { name: 'Belgium' }, + { name: 'Bulgaria' }, + { name: 'Croatia' }, + { name: 'Cyprus' }, + { name: 'Czech Republic' }, + { name: 'Denmark' }, + { name: 'Estonia' }, + { name: 'Finland' }, + { name: 'France' }, + { name: 'Germany' }, + { name: 'Greece' }, + { name: 'Hungary' }, + { name: 'Ireland' }, + { name: 'Italy' }, + { name: 'Latvia' }, + { name: 'Lithuania' }, + { name: 'Luxembourg' }, + { name: 'Malta' }, + { name: 'Netherlands' }, + { name: 'Poland' }, + { name: 'Portugal' }, + { name: 'Romania' }, + { name: 'Slovakia' }, + { name: 'Slovenia' }, + { name: 'Spain' }, + { name: 'Sweden' }, + ], + [CommitteeTemplate.G20]: [ + { name: 'Argentina' }, + { name: 'Australia' }, + { name: 'Brazil' }, + { name: 'Canada' }, + { name: 'China' }, + { name: 'European Union' }, + { name: 'France' }, + { name: 'Germany' }, + { name: 'India' }, + { name: 'Indonesia' }, + { name: 'Italy' }, + { name: 'Japan' }, + { name: 'Mexico' }, + { name: 'Russia' }, + { name: 'Saudi Arabia' }, + { name: 'South Africa' }, + { name: 'South Korea' }, + { name: 'Turkey' }, + { name: 'United Kingdom' }, + { name: 'United States' }, + ], + [CommitteeTemplate.NATO]: [ + { name: 'Albania' }, + { name: 'Belgium' }, + { name: 'Bulgaria' }, + { name: 'Canada' }, + { name: 'Croatia' }, + { name: 'Czech Republic' }, + { name: 'Denmark' }, + { name: 'United Kingdom' }, + { name: 'Estonia' }, + { name: 'France' }, + { name: 'Germany' }, + { name: 'Greece' }, + { name: 'Hungary' }, + { name: 'Iceland' }, + { name: 'Italy' }, + { name: 'Latvia' }, + { name: 'Lithuania' }, + { name: 'Luxembourg' }, + { name: 'Macedonia' }, + { name: 'Montenegro' }, + { name: 'Netherlands Antilles' }, + { name: 'Netherlands' }, + { name: 'Norway' }, + { name: 'Poland' }, + { name: 'Portugal' }, + { name: 'Romania' }, + { name: 'Slovakia' }, + { name: 'Slovenia' }, + { name: 'Spain' }, + { name: 'Turkey' }, + { name: 'United Arab Emirates' }, + { name: 'United States' }, + ], [CommitteeTemplate.SecurityCouncil]: [ { name: 'Belgium' }, { name: 'China', rank: 'Veto' }, @@ -384,27 +495,128 @@ export const TEMPLATE_TO_MEMBERS: Record = { name: 'United States', rank: 'Veto' }, { name: 'Vietnam' } ], - [CommitteeTemplate.G20]: [ + [CommitteeTemplate.WHOHealthBoard]: [ { name: 'Argentina' }, { name: 'Australia' }, - { name: 'Brazil' }, - { name: 'Canada' }, + { name: 'Austria' }, + { name: 'Bangladesh' }, + { name: 'Botswana' }, + { name: 'Burkina Faso' }, + { name: 'Chile' }, { name: 'China' }, - { name: 'European Union' }, - { name: 'France' }, + { name: 'Colombia' }, + { name: 'Djibouti' }, + { name: 'Finland' }, + { name: 'Gabon' }, { name: 'Germany' }, + { name: 'Ghana' }, + { name: 'Grenada' }, + { name: 'Guinea-Bissau' }, + { name: 'Guyana' }, { name: 'India' }, { name: 'Indonesia' }, + { name: 'Israel' }, + { name: 'Kenya' }, + { name: 'Madagascar' }, + { name: 'Oman' }, + { name: 'United Kingdom' }, + { name: 'Romania' }, + { name: 'Russia' }, + { name: 'Singapore' }, + { name: 'South Korea' }, + { name: 'Sudan' }, + { name: 'Tajikistan' }, + { name: 'Tonga' }, + { name: 'Tunisia' }, + { name: 'United Arab Emirates' }, + { name: 'United States' } + ], + [CommitteeTemplate.UNHRC]: [ + { name: 'Afghanistan' }, + { name: 'Angola' }, + { name: 'Argentina' }, + { name: 'Australia' }, + { name: 'Austria' }, + { name: 'Bahamas' }, + { name: 'Bahrain' }, + { name: 'Bangladesh' }, + { name: 'Brazil' }, + { name: 'Bulgaria' }, + { name: 'Burkina Faso' }, + { name: 'Cameroon' }, + { name: 'Chile' }, + { name: 'China' }, + { name: 'Congo' }, + { name: 'Croatia' }, + { name: 'Cuba' }, + { name: 'Czech Republic' }, + { name: 'Denmark' }, + { name: 'Egypt' }, + { name: 'United Kingdom' }, + { name: 'Eritrea' }, + { name: 'Fiji' }, + { name: 'Hungary' }, + { name: 'Iceland' }, + { name: 'Iraq' }, { name: 'Italy' }, { name: 'Japan' }, { name: 'Mexico' }, - { name: 'Russia' }, + { name: 'Nepal' }, + { name: 'Nigeria' }, + { name: 'Pakistan' }, + { name: 'Peru' }, + { name: 'Philippines' }, + { name: 'Qatar' }, + { name: 'Rwanda' }, { name: 'Saudi Arabia' }, + { name: 'Senegal' }, + { name: 'Slovakia' }, + { name: 'Somalia' }, { name: 'South Africa' }, - { name: 'South Korea' }, - { name: 'Turkey' }, + { name: 'Spain' }, + { name: 'Togo' }, + { name: 'Tunisia' }, + { name: 'Ukraine' }, + { name: 'United Arab Emirates' }, + { name: 'Uruguay' } + ], + [CommitteeTemplate.UNICEF]: [ + { name: 'Bangladesh' }, + { name: 'Benin' }, + { name: 'Brazil' }, + { name: 'Burundi' }, + { name: 'Cameroon' }, + { name: 'Canada' }, + { name: 'China' }, + { name: 'Colombia' }, + { name: 'Cuba' }, + { name: 'Denmark' }, + { name: 'Djibouti' }, { name: 'United Kingdom' }, + { name: 'Estonia' }, + { name: 'Germany' }, + { name: 'Ghana' }, + { name: 'Ireland' }, + { name: 'Japan' }, + { name: 'Lithuania' }, + { name: 'Mexico' }, + { name: 'Moldova' }, + { name: 'Mongolia' }, + { name: 'Morocco' }, + { name: 'New Zealand' }, + { name: 'Norway' }, + { name: 'Pakistan' }, + { name: 'Paraguay' }, + { name: 'Russia' }, + { name: 'South Korea' }, + { name: 'Spain' }, + { name: 'Sudan' }, + { name: 'Sweden' }, + { name: 'Switzerland' }, + { name: 'Turkmenistan' }, { name: 'United States' }, + { name: 'Yemen' }, + { name: 'Zimbabwe' } ] } From fb4bacf8d7b256b73a22c830206d18fd1a0b8c93 Mon Sep 17 00:00:00 2001 From: Max Bo Date: Thu, 10 Dec 2020 23:07:14 +1000 Subject: [PATCH 2/2] Don't reference enums for 'reasons' --- src/constants.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/constants.ts b/src/constants.ts index f37c2df1..4db244cb 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -325,7 +325,7 @@ export enum CommitteeTemplate { } export const TEMPLATE_TO_MEMBERS: Record = { - [CommitteeTemplate.AfricanUnion]: [ + 'African Union': [ { name: 'Algeria' }, { name: 'Angola' }, { name: 'Benin' }, @@ -374,7 +374,7 @@ export const TEMPLATE_TO_MEMBERS: Record = { name: 'Zambia' }, { name: 'Zimbabwe'} ], - [CommitteeTemplate.ASEAN]: [ + 'Association of Southeast Asian Nations': [ { name: 'Brunei' }, { name: 'Cambodia' }, { name: 'Indonesia' }, @@ -386,14 +386,14 @@ export const TEMPLATE_TO_MEMBERS: Record = { name: 'Thailand' }, { name: 'Vietnam' } ], - [CommitteeTemplate.BRICS]: [ + 'BRICS': [ { name: 'Brazil' }, { name: 'China' }, { name: 'India' }, { name: 'Russia' }, { name: 'South Africa' } ], - [CommitteeTemplate.EU]: [ + 'European Union': [ { name: 'Austria' }, { name: 'Belgium' }, { name: 'Bulgaria' }, @@ -422,7 +422,7 @@ export const TEMPLATE_TO_MEMBERS: Record = { name: 'Spain' }, { name: 'Sweden' }, ], - [CommitteeTemplate.G20]: [ + 'G20': [ { name: 'Argentina' }, { name: 'Australia' }, { name: 'Brazil' }, @@ -444,7 +444,7 @@ export const TEMPLATE_TO_MEMBERS: Record = { name: 'United Kingdom' }, { name: 'United States' }, ], - [CommitteeTemplate.NATO]: [ + 'North Atlantic Treaty Organization': [ { name: 'Albania' }, { name: 'Belgium' }, { name: 'Bulgaria' }, @@ -478,7 +478,7 @@ export const TEMPLATE_TO_MEMBERS: Record = { name: 'United Arab Emirates' }, { name: 'United States' }, ], - [CommitteeTemplate.SecurityCouncil]: [ + 'UN Security Council': [ { name: 'Belgium' }, { name: 'China', rank: 'Veto' }, { name: 'Dominican Republic' }, @@ -495,7 +495,7 @@ export const TEMPLATE_TO_MEMBERS: Record = { name: 'United States', rank: 'Veto' }, { name: 'Vietnam' } ], - [CommitteeTemplate.WHOHealthBoard]: [ + 'WHO Health Board': [ { name: 'Argentina' }, { name: 'Australia' }, { name: 'Austria' }, @@ -531,7 +531,7 @@ export const TEMPLATE_TO_MEMBERS: Record = { name: 'United Arab Emirates' }, { name: 'United States' } ], - [CommitteeTemplate.UNHRC]: [ + 'UN Human Rights Council': [ { name: 'Afghanistan' }, { name: 'Angola' }, { name: 'Argentina' }, @@ -580,7 +580,7 @@ export const TEMPLATE_TO_MEMBERS: Record = { name: 'United Arab Emirates' }, { name: 'Uruguay' } ], - [CommitteeTemplate.UNICEF]: [ + 'UN Children\'s Fund': [ { name: 'Bangladesh' }, { name: 'Benin' }, { name: 'Brazil' },