IGNITE-10961 Web console: Added more countries for "Sign up" and "Profile" screens.
diff --git a/e2e/testcafe/environment/envtools.js b/e2e/testcafe/environment/envtools.js
index c86a34a..0952951 100644
--- a/e2e/testcafe/environment/envtools.js
+++ b/e2e/testcafe/environment/envtools.js
@@ -146,6 +146,7 @@
const startEnv = (webConsoleRootDirectoryPath = '../../') => {
return new Promise(async(resolve) => {
+ const BACKEND_PORT = 3001;
const command = `${process.platform === 'win32' ? 'npm.cmd' : 'npm'} start`;
let port = 9001;
@@ -153,8 +154,8 @@
if (process.env.APP_URL)
port = parseInt(url.parse(process.env.APP_URL).port, 10) || 80;
- const backendInstanceLaunch = exec(command, 'Start listening', `${webConsoleRootDirectoryPath}backend`, {server_port: 3001, mongodb_url: mongoUrl}); // Todo: refactor cwd for backend when it's linked
- const frontendInstanceLaunch = exec(command, 'Compiled successfully', `${webConsoleRootDirectoryPath}frontend`, {BACKEND_PORT: 3001, PORT: port});
+ const backendInstanceLaunch = exec(command, 'Start listening', `${webConsoleRootDirectoryPath}backend`, {server_port: BACKEND_PORT, mongodb_url: mongoUrl});
+ const frontendInstanceLaunch = exec(command, 'Compiled successfully', `${webConsoleRootDirectoryPath}frontend`, {BACKEND_URL: `http://localhost:${BACKEND_PORT}`, PORT: port});
console.log('Building backend in progress...');
await backendInstanceLaunch;
diff --git a/frontend/app/components/form-signup/template.pug b/frontend/app/components/form-signup/template.pug
index 375ea95..b9ed948 100644
--- a/frontend/app/components/form-signup/template.pug
+++ b/frontend/app/components/form-signup/template.pug
@@ -83,7 +83,7 @@
)
.span-1
+form-field__dropdown({
- label: 'Country:',
+ label: 'Country/Region:',
model: '$ctrl.ngModel.$viewValue.country',
name: '"country"',
required: true,
diff --git a/frontend/app/components/page-profile/template.pug b/frontend/app/components/page-profile/template.pug
index 68c321f..2b2b748 100644
--- a/frontend/app/components/page-profile/template.pug
+++ b/frontend/app/components/page-profile/template.pug
@@ -69,11 +69,11 @@
)
.col-50
+form-field__dropdown({
- label: 'Country:',
+ label: 'Country/Region:',
model: '$ctrl.ui.user.country',
name: '"country"',
required: true,
- placeholder: 'Choose your country',
+ placeholder: 'Choose your country/region',
options: '$ctrl.ui.countries'
})
.row
diff --git a/frontend/app/data/countries.json b/frontend/app/data/countries.json
index b340f02..8f274ad 100644
--- a/frontend/app/data/countries.json
+++ b/frontend/app/data/countries.json
@@ -65,19 +65,24 @@
"code": "CHN"
},
{
- "label": "India",
- "value": "India",
- "code": "IND"
- },
- {
"label": "Japan",
"value": "Japan",
"code": "JPN"
},
{
- "label": "Other Asia",
- "value": "Other Asia",
- "code": "Other Asia"
+ "label": "South Korea",
+ "value": "South Korea",
+ "code": "KR"
+ },
+ {
+ "label": "Hong Kong",
+ "value": "Hong Kong",
+ "code": "HK"
+ },
+ {
+ "label": "Taiwan",
+ "value": "Taiwan",
+ "code": "TW"
},
{
"label": "Australia",
@@ -85,6 +90,58 @@
"code": "AUS"
},
{
+ "label": "Thailand",
+ "value": "Thailand",
+ "code": "TH"
+ },
+ {
+ "label": "Singapore",
+ "value": "Singapore",
+ "code": "SG"
+ },
+ {
+ "label": "Malaysia",
+ "value": "Malaysia",
+ "code": "MY"
+ },
+ {
+ "label": "Philippines",
+ "value": "Philippines",
+ "code": "PH"
+ },
+ {
+ "label": "Indonesia",
+ "value": "Indonesia",
+ "code": "ID"
+ },
+ {
+ "label": "Vietnam",
+ "value": "Vietnam",
+ "code": "VN"
+ },
+ {
+ "label": "Macau",
+ "value": "Macau",
+ "code": "MO"
+ },
+ {
+ "label": "New Zealand",
+ "value": "New Zealand",
+ "code": "NZ"
+ },
+ {
+ "label": "India",
+ "value": "India",
+ "code": "IND"
+ },
+
+ {
+ "label": "Other Asia",
+ "value": "Other Asia",
+ "code": "Other Asia"
+ },
+
+ {
"label": "Brazil",
"value": "Brazil",
"code": "BRA"
