change password

penioi · Jun 22, 2022 · 9bc982a · 9bc982a
1 parent 5c51aaa
commit 9bc982a
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 66 deletions.
diff --git a/src/app/pages/catalogue/types/type-details/type-details.component.html b/src/app/pages/catalogue/types/type-details/type-details.component.html
@@ -5,18 +5,7 @@
     <nb-card-header class="main_header">
       <h1 class="page_title">{{ 'PRODUCT_TYPE.PRODUCT_TYPE_DETAILS' | translate}}</h1>
       <div class="content_spacing">
-        <!--
-        <nb-select *ngIf="languages.length" placeholder="{{ 'COMMON.LANGUAGE' | translate }}" outline shape="rectangle"
-          class="fullWidth" formControlName='selectedLanguage' (onChange)="ngOnInit()">
-          <nb-option *ngFor="let language of languages" [value]="language.code">{{ ('LANG.'+language.code) |
-            translate }}</nb-option>
-        </nb-select>
-        -->
-        <!-- <nb-select *ngIf="languages.length" placeholder="{{ 'COMMON.LANGUAGE' | translate}}" outline shape="rectangle"
-          name='selectedLanguage' [selected]="defaultLanguage">
-          <nb-option (click)="selectLanguage(language.code)" *ngFor="let language of languages" [value]="language.code">{{
-            ('LANG.'+language.code) |translate }}</nb-option>
-        </nb-select> -->
+
       </div>
       <div class="content_spacing">
         <button type="button" nbButton class="cancel_button" (click)="goToback()">{{ 'ORDER_FORM.CANCLE'
@@ -71,57 +60,10 @@ <h1 class="page_title">{{ 'PRODUCT_TYPE.PRODUCT_TYPE_DETAILS' | translate}}</h1>
         </div>
 
 
-        <!--
-        <div class="form-group">
-          <label class="col-sm-10 col-form-label inputLabel">{{ 'COMMON.LANGUAGE' | translate}} *</label>
-          <div class="col-sm-12">
-            <nb-select *ngIf="languages.length" placeholder="{{ 'COMMON.LANGUAGE' | translate}}" outline
-              shape="rectangle" formControlName='selectedLanguage' class="fullWidth">
-              <nb-option *ngFor="let language of languages" [value]="language.code">{{ ('LANG.'+language.code) |
-                translate }}</nb-option>
-            </nb-select>
-          </div>
-        </div>
-
-        <div *ngIf="selectedLanguage.value !== ''" formArrayName='descriptions'>
-          <div *ngFor="let descr of descriptions.controls; let j=index">
-            <div *ngIf="descr.value.language === selectedLanguage.value">
-
-              <div [formGroupName]="j" class="description-block">
-
-                <div class="form-group">
-                  <label for="name" class="col-sm-10 col-form-label inputLabel">{{ 'DESCRIPTION_FORM.NAME' |
-                    translate}}</label>
-                  <div class="col-sm-12">
-                    <input type="text" class="form-control inputText" id="name" formControlName='name'
-                      placeholder="{{ 'DESCRIPTION_FORM.NAME' | translate}}" (ngModelChange)="changeName($event, j)">
-                    <span *ngIf="(descr.get('name').dirty || descr.get('name').touched)
-                              && descr.get('name').invalid && descr.get('name').errors.required" class="err-message">
-                      {{ 'DESCRIPTION_FORM.NAME_REQUIRED' | translate}}
-                    </span>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-       -->
-
-
-
-
 
         <div class="form-group">
           <label class="col-form-label inputLabel">{{ 'COMMON.LANGUAGE' | translate}} *</label>
 
-          <!--
-          <nb-select *ngIf="languages.length" placeholder="{{ 'COMMON.LANGUAGE' | translate}}" outline shape="rectangle"
-            class="fullWidth" name='selectedLanguage' [selected]="defaultLanguage">
-            <nb-option (click)="selectLanguage(language.code)" *ngFor="let language of languages"
-              [value]="language.code">{{
-              ('LANG.'+language.code) |translate }}</nb-option>
-          </nb-select>
-        -->
 
           <nb-select *ngIf="languages.length" placeholder="{{ 'COMMON.LANGUAGE' | translate}}" outline
           shape="rectangle" formControlName='selectedLanguage' class="fullWidth">

diff --git a/src/app/pages/shared/components/image-uploading/image-uploading.component.html b/src/app/pages/shared/components/image-uploading/image-uploading.component.html
@@ -5,10 +5,10 @@
 
       <ngx-awesome-uploader [enableCropper]="false" [showPreviewContainer]="false" [adapter]="adapter"
         [fileMaxCount]="10" [fileMaxSize]="4" [uploadType]="'multi'" (validationError)="onValidationError($event)"
-        [fileExtensions]="['jpg', 'jpeg', 'png', 'gif']" [enableCropper]="false"
+        [fileExtensions]="['jpg', 'jpeg', 'png', 'gif', 'webp']" [enableCropper]="false"
         (uploadSuccess)="onUploadSuccess($event)" (uploadError)="onUploadError($event)"
         (removeSuccess)="onRemoveSuccess($event)" (fileAdded)="onFileAdded($event)" [itemTemplate]="uploadItemTemplate"
-        [accept]="'.jpg, .png, .gif, .jpeg'">
+        [accept]="'.jpg, .png, .gif, .webp, .jpeg'">
         <div class="dropzoneTemplate">
           <div class="content">
             <img src="../../../../../assets/img/cloud-computing.png" width="80">
@@ -26,7 +26,7 @@
       let-uploadProgress="uploadProgress">
       <p>File Size: {{fileItem.file.size}}</p>
       <p>File Name: {{fileItem.fileName}}</p>
-      <p> Upload Progress: {{uploadProgress}} % </p>
+      <p>Upload Progress: {{uploadProgress}} % </p>
     </ng-template>
   </div>
 

diff --git a/src/app/pages/user-management/change-password/change-password.component.ts b/src/app/pages/user-management/change-password/change-password.component.ts
@@ -95,7 +95,7 @@ export class ChangePasswordComponent implements OnInit {
     this.loader = true;
     const passwords = {
       changePassword: this.form.value.newPassword,
-      password: this.form.value.newPassword
+      password: this.form.value.password
     };
     this.userService.updatePassword(this.userService.getUserId(), passwords)
       .subscribe(res => {

diff --git a/src/assets/env.js b/src/assets/env.js
@@ -2,7 +2,7 @@
     window["env"] = window["env"] || {};
 
     // Environment variables
-    window["env"]["APP_BASE_URL"] = "https://rest-api.shopizer.com/api";
+    window["env"]["APP_BASE_URL"] = "apiUrl: https://rest-api.shopizer.com/api",
     window["env"]["APP_SHIPPING_URL"] = 'http://localhost:9090/api"';
     window["env"]["APP_MAP_API_KEY"] = '';
     window["env"]["APP_DEFAULT_LANGUAGE"] = 'fr';

diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
@@ -8,7 +8,7 @@ export const environment = {
     //MARKETPLACE | BTB | STANDARD
     mode: 'STANDARD',
     //API URL
-    apiUrl: window["env"]["APP_BASE_URL"] || 'https/localhost:8080/api/v1',
+    apiUrl: window["env"]["APP_BASE_URL"] || 'http://localhost:8080/api/v1',
     shippingApi: window["env"]["APP_SHIPPING_URL"] || 'http://localhost:9090/api',
     client: {
         language: {

diff --git a/src/environments/environment.ts b/src/environments/environment.ts
@@ -17,7 +17,8 @@ export const environment = {
     //MARKETPLACE | BTB | STANDARD
     mode: 'STANDARD',
     //API URL
-    apiUrl: "http://localhost:8080/api",
+    //apiUrl: "http://localhost:8080/api",
+    apiUrl: "https://rest-api.shopizer.com/api",
     shippingApi: 'http://localhost:9090/shipping/api/v1',
     client: {
         language: {