@chat21/chat21-ionic 2.0.13 → 3.0.5-9.2

package/src/pages/authentication/login/login.scss

@@ -1,121 +0,0 @@
-page-login {
-  ion-title {
-    text-align: center;
-  }
-  
-  h2 {
-    text-align: center;
-    margin: 10px;
-  }
-  form {
-    margin-bottom: 20px;
-    padding: 0px 10px 0px 10px;
-    button {
-      margin-top: 20px !important;
-    }
-    p {
-      font-style: italic;
-      color: red;
-    }
-  }
-  .invalid {
-    border-bottom: 1px solid #FF6153;
-  }
-  .item-block{
-    min-height: auto;
-  }
-  .item-md {
-    font-size: 1.3rem;
-  }
-  .item-md.item-input.ng-invalid.ng-touched:not(.input-has-focus) .item-inner{
-    border-bottom: 0px!important;
-  }
-  .item-md.item-input .item-inner{
-    border-bottom: 0px!important;
-  }
-  .div-error-message {
-    min-height: 30px;
-    .error-message {
-      max-height: 24px;
-    }
-    .item-inner {
-      border-bottom: 0 !important;
-    }
-    .item p {
-      font-size: 1.0rem;
-    }
-  }
-
-  .sample-modal-page {
-    background: rgba(0,0,0,0.0);
-    height: 100%;
-    padding: 46px;
-    
-    .scroll-content{
-      margin-top: 36px!important;
-      padding: 0px!important;
-    }
-
-  }
-  .content-page {
-    background: #FFFFFF;
-    padding: 20px;
-    margin: 0px;
-    height: 100%;
-    text-align: -webkit-center;
-
-    form {
-      .item{
-        padding-left: 0px;
-        font-size: 1.3rem;
-      }
-      ion-input {
-        padding: 0px 10px 0px 10px;
-      }
-    }
-    
-
-    ion-item {
-      .item-inner .input-wrapper{
-        padding-right: 0px!important;
-        //border-bottom: 1px solid #c8c7cc!important;
-      }
-    } 
-    
-    .item-input ion-input, .item-input ion-textarea {
-      background-color: rgba(204, 204, 204, 0.40);
-      //border-bottom: 1px solid #cccccc;
-    }
-    .item-md.item-block .item-inner {
-      padding-right: 0px;
-    }
-    .text-input{
-      padding: 4px 0px 4px 0px;
-    }
-    button{
-      width: 100%;
-      background-color: #FFFFFF !important;
-      height: 34px;
-      margin: 0px 20px 15px 20px;
-      width: calc(100% - 40px);
-      border-radius: 8px;
-      font-size: small;
-      color:rgb(39, 62, 83);
-    }
-    button.full{
-      background-color: rgb(39, 62, 83) !important;
-      height: 34px;
-      border-radius: 8px;
-      font-size: small;
-      color:#FFFFFF;
-    }
-  }
- 
-    .c21-start-msg{
-      text-align: center;
-      font-size: 20px;
-      padding: 30px 0px;
-    }
-
-}
-

package/src/pages/authentication/login/login.ts

@@ -1,221 +0,0 @@
-import { Component } from '@angular/core';
-import { AlertController, LoadingController, ModalController, NavParams } from 'ionic-angular';
-import { FormBuilder, Validators } from '@angular/forms';
-// pages
-import { RegisterPage } from '../../authentication/register/register';
-import { ResetpwdPage } from '../../authentication/resetpwd/resetpwd';
-// services
-import { AuthService } from '../../../providers/auth-service';
-// import { DASHBOARD_URL, BASE_URL_HOSTNAME } from '../../../utils/constants';
-// import { isHostname } from '../../../utils/utils';
-import { environment } from '../../../environments/environment';
-import { AppConfigProvider } from '../../../providers/app-config/app-config';
-
-@Component({
-  selector: 'page-login',
-  templateUrl: 'login.html'
-})
-
-export class LoginPage {
-  private loginForm;
-  private submitAttempt: boolean = false;
-  private loading: any;
-  private showPage: boolean;
-  private tenant: string;
-  private hostname: string;
-  
-  // isHostname = isHostname;
-
-  supportMode = environment.supportMode
-  constructor(
-    private modalCtrl: ModalController,
-    public navParams: NavParams,
-    private authService: AuthService, 
-    private formBuilder: FormBuilder,
-    private alertCtrl: AlertController, 
-    private loadingCtrl: LoadingController,
-    public appConfig: AppConfigProvider
-  ) {
-    //console.log("LOGIN PAGE");
-    this.tenant = navParams.get('tenant');
-    this.hostname = window.location.hostname;
-  }
-
-  /**
-   * imposto espressione regolare per verifica email
-   * imposto il form della pagina con i campi da validare (email e psw)
-   */
-  ngOnInit() {
-    //console.log('ngOnInit');
-    let EMAIL_REGEXP = /^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i;
-    this.loginForm = this.formBuilder.group({
-      email: ['', Validators.compose([Validators.required, Validators.pattern(EMAIL_REGEXP)])],
-      password: ['', Validators.compose([Validators.minLength(6), Validators.required])]
-    });
-  }
-  /**
-   * quando entro nella pagina imposto showPage a true 
-   * e visualizzo il div della pagina 
-   * controllo se sono già loggato e dismetto la view
-   * utile quando vengo dalla registrazione utente
-   * show view
-   */
-  ionViewWillEnter() {
-    this.showPage = true;
-    // if (this.authService.getUser()){
-    //   this.viewCtrl.dismiss({animation:'none'})
-    // }
-  }
-  /**
-   * quando esco dalla pagina imposto showPage a false
-   * che nasconde il div del login
-   */
-  ionViewWillLeave(){
-    this.showPage = false;
-  }
-  /**
-   * quando scrivo nel campo email o psw
-   * richiamo questo metodo che  ???? booohhhh
-   * @param input 
-   */
-  elementChanged(input){
-    // let field = input.inputControl.firstname;
-    // this[field + "Changed"] = true;
-  }
-  /**
-   * quando premo sul pulsante registrati 
-   * richiamo questa func che carica la pagina RegisterPage
-   */
-  register(){
-    let profileModal = this.modalCtrl.create(RegisterPage, null, { enableBackdropDismiss: false });
-    profileModal.present({animate: false, duration: 0});
-    //this.navCtrl.push(RegisterPage);
-  }
-  /**
-   * quando premo sul pulsante reset psw 
-   * richiamo questa func che carica la pagina ResetpwdPage
-   */
-  resetPwd(){
-    let profileModal = this.modalCtrl.create(ResetpwdPage, null, { enableBackdropDismiss: false });
-    profileModal.present({animate: false, duration: 0});
-    //this.navCtrl.push(ResetpwdPage);
-  }
-
-  /**
-   * 
-   */
-  tiledeskLogin(){
-    let DASHBOARD_URL = this.appConfig.getConfig().DASHBOARD_URL;
-    console.log('this.appConfig.getConfig().DASHBOARD_URL ', DASHBOARD_URL) 
-    window.open(DASHBOARD_URL, "_blank");
-    //this.loginUserFirebase();
-  }
-  
-  // isHostname(){
-  //   // alert( "domain: " + this.hostname + BASE_URL_HOSTNAME);
-  //   if(this.hostname === BASE_URL_HOSTNAME){return true}
-  //   return false
-  // }
-
-
-signInWithCustomToken(email, psw) {
-    let json = JSON.stringify({
-        "email": email,
-        "password": psw
-    });
-    var urlCustomToken = 'https://tiledesk-server-pre.herokuapp.com/firebase/auth/signin';
-    var httpRequest = this.createCORSRequest('POST', urlCustomToken,true); //set async to false because loadParams must return when the get is complete
-    if (!httpRequest) {
-        throw new Error('CORS not supported');
-    }
-    httpRequest.setRequestHeader('Content-type', 'application/json');
-    httpRequest.send(json);
-    httpRequest.onload = function() {
-        if (httpRequest.readyState === XMLHttpRequest.DONE) {
-            if (httpRequest.status === 200) {
-                try {
-                    var response = JSON.parse(httpRequest.responseText);
-                    //window.tiledesk.signInWithCustomToken(response);
-                }
-                catch(err) {
-                    console.error(err.message);
-                }
-                return true;
-            } else {
-                alert('There was a problem with the request.');
-            }
-        }         
-    };
-    httpRequest.onerror = function() {
-        console.error('There was an error!');
-        return false;
-    };
-}
-
-createCORSRequest(method, url, async) {
-  console.log("createCORSRequest");
-    var xhr = new XMLHttpRequest();
-    if ("withCredentials" in xhr) {
-        // Check if the XMLHttpRequest object has a "withCredentials" property.
-        // "withCredentials" only exists on XMLHTTPRequest2 objects.
-        xhr.open(method, url, async);
-        console.log("xhr12");
-    } 
-//     else if (typeof XDomainRequest != "undefined") {
-//          // Otherwise, check if XDomainRequest.
-//          // XDomainRequest only exists in IE, and is IE's way of making CORS requests.
-//          xhr = new XDomainRequest();
-//          xhr.open(method, url);
-//          console.log("xhr111");
-//     } 
-    else {
-         // Otherwise, CORS is not supported by the browser.
-         xhr = null;
-         console.log("xhrnull");
-    }
-    return xhr;
-}
-
-
-
-
-  /**
-   * quando premo sul pulsante login richiamo questa func che:
-   * effettuo il login e se riesce chiudo tutte le pg aperte
-   * altrimenti apro un alert di errore
-   */
-  loginUserFirebase(){
-    this.submitAttempt = true;
-    console.log("LOGIN", this.loginForm.value);
-    if (!this.loginForm.valid){
-      console.log("ERRORE LOGIN:: ",this.loginForm.value);
-    } else {
-      this.authService.doLoginFirebase(this.loginForm.value.email, this.loginForm.value.password)
-      .then( user => {
-        //console.log("register",user.uid, this.userService);
-        //this.userService.setCurrentUserDetails(user.uid, user.email);
-        //dismetto la modale ricarico lista conversazioni passando user
-        this.loading.dismiss();
-      })
-      .catch(error => {
-          console.log(error,'ERROR LOGIN FIREBASE');
-          this.loading.dismiss().then( () => {
-            let alert = this.alertCtrl.create({
-              message: error.message,
-              buttons: [
-                {
-                  text: "Ok",
-                  role: 'cancel'
-                }
-              ]
-            });
-            alert.present();
-          });
-      });
-      this.loading = this.loadingCtrl.create({
-        dismissOnPageChange: true,
-      });
-      this.loading.present();
-    }
-  }
-}

package/src/pages/authentication/register/register.html

@@ -1,88 +0,0 @@
-<!--
-  Generated template for the Register page.
-
-  See http://ionicframework.com/docs/components/#navigation for more info on
-  Ionic pages and navigation.
--->
-<ion-header>
-
-  <ion-navbar>
-    <ion-title>{{ 'LABEL_REGISTRATION' | translate }}</ion-title>
-    <ion-buttons left>
-        <button ion-button icon-only (click)="goBack()">
-          <ion-icon name="close"></ion-icon>
-        </button>
-      </ion-buttons>
-  </ion-navbar>
-
-</ion-header>
-
-
-
-<ion-content padding class="sample-modal-page">
-  <div class="content-page">
-  <!-- <h2>Registrazione</h2> -->
-  
-  <form [formGroup]="registerForm" (submit)="createAccount()" novalidate>
-    <!-- <ion-item>
-      <ion-label stacked>Username</ion-label>
-      <ion-input #username formControlName="username" type="text" (change)="elementChanged(username)"
-        placeholder="Your username"
-        [class.invalid]="!registerForm.controls.username.valid && (usernameChanged || submitAttempt)"></ion-input>
-    </ion-item>
-    <ion-item class="error-message" *ngIf="!registerForm.controls.username.valid  && (usernameChanged || submitAttempt)">
-      <p>Please enter a valid username.</p>
-    </ion-item> -->
-
-    <ion-item>
-      <ion-label stacked>{{ 'LABEL_EMAIL' | translate }}</ion-label>
-      <ion-input #email formControlName="email" type="email" (change)="elementChanged(email)"
-        placeholder="{{ 'LABEL_PLACEHOLDER_EMAIL' | translate }}"
-        [class.invalid]="!registerForm.controls.email.valid && (emailChanged || submitAttempt)"></ion-input>
-    </ion-item>
-    <div class="div-error-message">
-    <ion-item class="error-message" *ngIf="!registerForm.controls.email.valid  && (emailChanged || submitAttempt)">
-      <p>{{ 'LABEL_ERROR_EMAIL' | translate }}</p>
-    </ion-item>
-    </div>
-
-    <ion-item>
-      <ion-label stacked>{{ 'LABEL_PASSWORD' | translate }}</ion-label>
-      <ion-input #password formControlName="password" type="password" (change)="elementChanged(password)"
-        placeholder="{{ 'LABEL_PLACEHOLDER_PASSWORD' | translate }}"
-        [class.invalid]="!registerForm.controls.password.valid && (passwordChanged || submitAttempt)"></ion-input>
-    </ion-item>
-    <div class="div-error-message">
-    <ion-item class="error-message" *ngIf="!registerForm.controls.password.valid  && (passwordChanged || submitAttempt)">
-      <p>{{ 'LABEL_ERROR_PASSWORD' | translate }}</p>
-    </ion-item>
-    </div>
-
-    <ion-item>
-      <ion-label stacked>{{ 'LABEL_NAME' | translate }}</ion-label>
-      <ion-input #firstname formControlName="firstname" type="text" (change)="elementChanged(firstname)"
-        placeholder="{{ 'LABEL_PLACEHOLDER_NAME' | translate }}"
-        [class.invalid]="!registerForm.controls.firstname.valid && (nameChanged || submitAttempt)"></ion-input>
-    </ion-item>
-    <div class="div-error-message">
-    <ion-item class="error-message" *ngIf="!registerForm.controls.firstname.valid  && (nameChanged || submitAttempt)">
-      <p>{{ 'LABEL_FIELD_NOT_EMPTY' | translate }}</p>
-    </ion-item>
-    </div>
-    <ion-item>
-        <ion-label stacked>{{ 'LABEL_LAST_NAME' | translate }}</ion-label>
-        <ion-input #lastname formControlName="lastname" type="text" (change)="elementChanged(lastname)"
-          placeholder="{{ 'LABEL_PLACEHOLDER_LAST_NAME' | translate }}"
-          [class.invalid]="!registerForm.controls.lastname.valid && (lastnameChanged || submitAttempt)"></ion-input>
-      </ion-item>
-      <div class="div-error-message">
-      <ion-item class="error-message" *ngIf="!registerForm.controls.lastname.valid  && (lastnameChanged || submitAttempt)">
-        <p>{{ 'LABEL_FIELD_NOT_EMPTY' | translate }}</p>
-      </ion-item>
-      </div>
-    <button ion-button block class="full" type="submit">
-      {{ 'LABEL_SIGIN' | translate }}
-    </button>
-  </form>
-  </div>
-</ion-content>

package/src/pages/authentication/register/register.module.ts

@@ -1,16 +0,0 @@
-import { NgModule } from '@angular/core';
-import { IonicPageModule } from 'ionic-angular';
-import { RegisterPage } from './register';
-
-@NgModule({
-  declarations: [
-    RegisterPage,
-  ],
-  imports: [
-    IonicPageModule.forChild(RegisterPage),
-  ],
-  exports: [
-    RegisterPage
-  ]
-})
-export class RegisterModule {}

package/src/pages/authentication/register/register.scss

@@ -1,95 +0,0 @@
-// .modal-wrapper{
-//     opacity: 1!important;
-// }
-
-
-page-register {
-    ion-title {
-        text-align: center;
-    }
-    h2 {
-        text-align: center;
-        margin: 10px;
-    }
-    form {
-        margin-bottom: 20px;
-        p {
-            font-style: italic;
-            color: red;
-        }
-    }
-    .invalid {
-        border-bottom: 1px solid #FF6153;
-    }
-    .item-block{
-        min-height: auto;
-    }
-    .item-md {
-        font-size: 1.3rem;
-    }
-    .item-md.item-input.ng-invalid.ng-touched:not(.input-has-focus) .item-inner{
-        border-bottom: 0px!important;
-    }
-    .item-md.item-input .item-inner{
-        border-bottom: 0px!important;
-    }
-    .div-error-message {
-        min-height: 30px;
-        .error-message {
-        max-height: 24px;
-        }
-        .item-inner {
-        border-bottom: 0 !important;
-        }
-        .item-md p {
-        font-size: 1.1rem;
-        }
-    }
-
-    .sample-modal-page {
-        background: rgba(0, 0, 0, 0.0);
-        height: 100%;
-        padding: 46px;
-        
-        .scroll-content{
-            margin-top: 36px!important;
-            padding: 0px!important;
-            // padding-bottom: 16px!important;
-            // padding: 56px 26px 26px 26px !important;
-        }
-    }
-        .content-page {
-        background: #FFFFFF;
-        padding: 20px;
-        margin: 0px;
-        height: 100%;
-        text-align: -webkit-center;
-
-        .item-input ion-input, .item-input ion-textarea {
-            background-color: rgba(204, 204, 204, 0.50);
-        }
-        .item-md.item-block .item-inner {
-            padding-right: 0px;
-        }
-        .text-input{
-            padding: 0px 10px 0px 10px;
-        }
-        button{
-            width: 100%;
-            background-color: #FFFFFF !important;
-            height: 34px;
-            margin: 0px 20px 15px 20px;
-            width: calc(100% - 40px);
-            border-radius: 8px;
-            font-size: small;
-            color:rgb(39, 62, 83);
-          }
-          button.full{
-            background-color: rgb(39, 62, 83) !important;
-            height: 34px;
-            border-radius: 8px;
-            font-size: small;
-            color:#FFFFFF;
-          }
-    }
-}

package/src/pages/authentication/register/register.ts

@@ -1,122 +0,0 @@
-import { Component } from '@angular/core';
-import { ViewController, NavController, AlertController, LoadingController } from 'ionic-angular';
-import { FormBuilder, Validators } from '@angular/forms';
-
-// services
-import { AuthService } from '../../../providers/auth-service';
-import { UserService } from '../../../providers/user/user';
-
-@Component({
-  selector: 'page-register',
-  templateUrl: 'register.html'
-})
-export class RegisterPage {
-
-  public registerForm;
-  public usernameChanged: boolean = false;
-  public emailChanged: boolean = false;
-  public passwordChanged: boolean = false;
-  public fullnameChanged: boolean = false;
-  public submitAttempt: boolean = false;
-  public loading: any;
-
-  constructor(
-    public viewCtrl: ViewController, 
-    public navCtrl: NavController, 
-    public authService: AuthService,  
-    public formBuilder: FormBuilder,
-    public alertCtrl: AlertController, 
-    public loadingCtrl: LoadingController,
-    public userService: UserService
-  ) {
-  }
-
-  /**
-   * imposto espressione regolare per verifica email
-   * imposto il form della pagina con i campi da validare (email, psw, firstname, lastname)
-   */
-  ngOnInit() {
-    let EMAIL_REGEXP = /^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i;
-    this.registerForm = this.formBuilder.group({
-      email: ['', Validators.compose([Validators.required, Validators.pattern(EMAIL_REGEXP)])],
-      password: ['', Validators.compose([Validators.minLength(6), Validators.required])],
-      firstname: ['', Validators.compose([Validators.minLength(2), Validators.required])],
-      lastname: ['', Validators.compose([Validators.minLength(2), Validators.required])]
-    });
-  }
-  /**
-   * chiamato ogni volta che cambio il valore di un campo input
-   * NON ricordo a cosa serve!!!!
-   * @param input 
-   */
-  elementChanged(input){
-    if(input && input.inputControl){
-      let field = input.inputControl.firstname;
-      this[field + "Changed"] = true;
-    }
-    return
-  }
-  /**
-   * metodo chiamato dalla pagina html alla pressione del tasto 'registrati'
-   * verifico se i campi inseriti sono corretti e procedo alla registrazione dell'utente
-   * al termine dismetto loading e dismetto view
-   */
-  createAccount(){
-    this.submitAttempt = true;
-    if (!this.registerForm.valid){
-      console.log(this.registerForm.value);
-      // non faccio nulla perchè gli errori sono evidenziati in rosso nella pg html
-    } else {
-      console.log("createAccount", this.authService);
-      this.authService.register(this.registerForm.value.email, this.registerForm.value.password, this.registerForm.value.firstname, this.registerForm.value.lastname)
-      .then((newUser) => {
-        // creo current user detail
-        console.log("register::: ",newUser.user, this.userService);
-        this.userService.saveCurrentUserDetail(newUser.user.uid, this.registerForm.value.email, this.registerForm.value.firstname, this.registerForm.value.lastname)
-        .then(_ => {
-          console.log('success saveCurrentUserDetail');
-          this.viewCtrl.dismiss({animate: false, duration: 0});
-          this.loading.dismiss();
-          // this.loading.dismiss().then( () => {
-          //   //dismetto la modale ricarico lista conversazioni passando user
-          //   //this.loading.dismiss();
-          //   console.log('success!!!!');
-          //   this.viewCtrl.dismiss({animate: false, duration: 0});
-          // });
-        }) 
-        .catch(err => {
-          console.log(err,'ERROR saveCurrentUserDetail');
-          this.authService.delete();
-        });
-      })
-      .catch(error => {
-        console.log(error, 'Registrazione authentication fallita');
-        this.loading.dismiss().then( () => {
-          console.log("dismetto con errore");
-          let alert = this.alertCtrl.create({
-            message: error.message,
-            buttons: [
-              {
-                text: "Ok",
-                role: 'cancel'
-              }
-            ]
-          });
-          alert.present();
-        });
-      });  
-      // attivo il loading
-      this.loading = this.loadingCtrl.create({
-        dismissOnPageChange: true,
-      });
-      this.loading.present();
-    }
-  }
-  /**
-   * chiudo il popup di registrazione
-   */
-  goBack(){
-    this.navCtrl.pop({animate: false, duration: 0});    
-  }
-
-}