IGNITE-10961 Web console: Added more countries for "Sign up" and "Pro…

…file" screens.
gridgain · Jan 29, 2019 · bdeed89 · bdeed89
1 parent 13b81f0
commit bdeed89
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 13 deletions.
diff --git a/modules/web-console/e2e/testcafe/environment/envtools.js b/modules/web-console/e2e/testcafe/environment/envtools.js
@@ -146,15 +146,16 @@ const exec = (command, onResolveString, cwd, env) => {
 
 const startEnv = (webConsoleRootDirectoryPath = '../../') => {
     return new Promise(async(resolve) => {
+        const BACKEND_PORT = 3001;
         const command = `${process.platform === 'win32' ? 'npm.cmd' : 'npm'} start`;
 
         let port = 9001;
 
         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/modules/web-console/frontend/app/components/form-signup/template.pug b/modules/web-console/frontend/app/components/form-signup/template.pug
@@ -83,7 +83,7 @@ include /app/helpers/jade/mixins
         )
     .span-1
         +form-field__dropdown({
-            label: 'Country:',
+            label: 'Country/Region:',
             model: '$ctrl.ngModel.$viewValue.country',
             name: '"country"',
             required: true,

diff --git a/modules/web-console/frontend/app/components/page-profile/template.pug b/modules/web-console/frontend/app/components/page-profile/template.pug
@@ -69,11 +69,11 @@ div
                 )
             .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/modules/web-console/frontend/app/data/countries.json b/modules/web-console/frontend/app/data/countries.json
@@ -64,26 +64,83 @@
     "value": "China",
     "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",
     "value": "Australia",
     "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",