Merge branch 'feature/chat' into developer

android/app/src/main/assets/public/main-es2015.js

@@ -635,7 +635,13 @@ __webpack_require__.r(__webpack_exports__);
 const environment = {
     production: false,
     apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/',
+<<<<<<< HEAD
     apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/',
+=======
+    /* apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/', */
+    apiChatUrl: 'https://www.tabularium.pt/api/v1/',
+    /* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */
+>>>>>>> feature/chat
     domain: 'gabinetedigital.local',
     defaultuser: 'paulo.pinto',
     defaultuserpwd: 'tabteste@006'

android/app/src/main/assets/public/main-es5.js

@@ -776,7 +776,15 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
     var environment = {
       production: false,
       apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/',
+<<<<<<< HEAD
       apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/',
+=======
+
+      /* apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/', */
+      apiChatUrl: 'https://www.tabularium.pt/api/v1/',
+
+      /* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */
+>>>>>>> feature/chat
       domain: 'gabinetedigital.local',
       defaultuser: 'paulo.pinto',
       defaultuserpwd: 'tabteste@006'

android/app/src/main/assets/public/pages-login-login-module-es2015.js

@@ -165,6 +165,7 @@ let LoginPage = class LoginPage {
             yield alert.present();
         });
     }
+<<<<<<< HEAD
     /* loginRocketChat(){
       this.authService.loginChat(this.postData).subscribe((res: any) =>{
         this.storageService.store(AuthConnstants.AUTH, res.data);
@@ -173,6 +174,18 @@ let LoginPage = class LoginPage {
         console.log('Network error');
       });
     } */
+=======
+    loginRocketChat() {
+        this.authService.loginChat(this.postData).subscribe((res) => {
+            this.storageService.store(src_app_config_auth_constants__WEBPACK_IMPORTED_MODULE_8__["AuthConnstants"].AUTH, res.data);
+            console.log('Login to Rocket chat OK');
+            this.presentAlert('Login to Rocket chat OK');
+        }, (error) => {
+            console.log('Network error');
+            this.presentAlert('Network error ' + error);
+        });
+    }
+>>>>>>> feature/chat
     Login() {
         return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
             try {

android/app/src/main/assets/public/pages-login-login-module-es5.js

@@ -318,8 +318,16 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
           this.authService.loginChat(this.postData).subscribe((res: any) =>{
             this.storageService.store(AuthConnstants.AUTH, res.data);
             console.log('Login to Rocket chat OK');
+<<<<<<< HEAD
          },(error:any) =>{
+=======
+
+            _this.presentAlert('Login to Rocket chat OK');
+          }, function (error) {
+>>>>>>> feature/chat
             console.log('Network error');
+
+            _this.presentAlert('Network error ' + error);
           });
         } */