Merge branch 'features-o' of onunez/frontend-inversiones into development

package.json

@@ -48,6 +48,7 @@
     "ngx-animating-datepicker": "^1.2.1",
     "ngx-bootstrap": "^5.1.1",
     "ngx-daterangepicker": "^1.1.1",
+    "pdfmake": "^0.1.66",
     "perfect-scrollbar": "^1.4.0",
     "popper.js": "^1.15.0",
     "print-js": "^1.0.63",

src/app/components/instruments/fondos/fondos.component.html

@@ -1,6 +1,6 @@
 <div *ngIf="!summary">
   <h4 class="card-title">
-    Bonos
+    Fondos de inversión
   </h4>
   <form
     class="form-auth-small ng-untouched ng-pristine ng-valid"
@@ -12,7 +12,7 @@
           <label for="cuota_participacion">Cuota de participación: </label>
           <div class="input-box-container">
             <p>
-              <i class="fas fa-dollar-sign" aria-hidden="true"></i>
+              <i class="fas fa-sort-numeric-up-alt"></i>
             </p>
             <input
               type="text"
@@ -39,30 +39,27 @@
 
       <div class="col-lg-6 col-sm-12 pr-xl-3">
         <div class="form-group">
-          <label for="valor_participacion_porcentaje"
-            >Valor participación:
-          </label>
+          <label for="valor_participacion">Valor participación: </label>
           <div class="input-box-container">
             <p>
               <i class="fas fa-dollar-sign"></i>
             </p>
             <input
               type="text"
-              formControlName="valor_participacion_porcentaje"
+              formControlName="valor_participacion"
               class="form-control"
               [ngClass]="{
-                'is-invalid':
-                  submitted && f.valor_participacion_porcentaje.errors
+                'is-invalid': submitted && f.valor_participacion.errors
               }"
             />
             <div
-              *ngIf="submitted && f.valor_participacion_porcentaje.errors"
+              *ngIf="submitted && f.valor_participacion.errors"
               class="invalid-feedback"
             >
-              <div *ngIf="f.valor_participacion_porcentaje.errors.required">
+              <div *ngIf="f.valor_participacion.errors.required">
                 Campo requerido
               </div>
-              <div *ngIf="f.valor_participacion_porcentaje.errors.pattern">
+              <div *ngIf="f.valor_participacion.errors.pattern">
                 Debe ingresar una cifra válida
               </div>
             </div>
@@ -319,14 +316,14 @@
         <div class="col-sm-4">
           <h4>Cuota participación:</h4>
           <div class="field">
-            $USD {{ cuota_participacion | number: "1.2-4" }}
+            {{ cuota_participacion | number: "1.2-4" }}
           </div>
         </div>
 
         <div class="col-sm-4">
           <h4>Valor participación:</h4>
           <div class="field">
-            {{ valor_participacion_porcentaje | number: "1.2-4" }} %
+            $USD {{ valor_participacion | number: "1.2-4" }}
           </div>
         </div>
 
@@ -458,7 +455,7 @@
                 {{
                   row.fecha_pago == "" || row.fecha_pago == undefined
                     ? "-"
-                    : row.fecha_pago
+                    : (row.fecha_pago | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef></td>
@@ -469,7 +466,7 @@
                 {{
                   row.ingreso_bruto == "" || row.ingreso_bruto == undefined
                     ? "-"
-                    : row.ingreso_bruto
+                    : (row.ingreso_bruto | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
@@ -485,7 +482,7 @@
                 {{
                   row.ingreso_neto == "" || row.ingreso_neto == undefined
                     ? "-"
-                    : row.ingreso_neto
+                    : (row.ingreso_neto | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
@@ -502,7 +499,7 @@
                   row.dividendo_porcentaje == "" ||
                   row.dividendo_porcentaje == undefined
                     ? "-"
-                    : row.dividendo_porcentaje
+                    : (row.dividendo_porcentaje | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
@@ -519,7 +516,7 @@
                   row.rendimiento_porcentaje == "" ||
                   row.rendimiento_porcentaje == undefined
                     ? "-"
-                    : row.rendimiento_porcentaje
+                    : (row.rendimiento_porcentaje | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
@@ -535,7 +532,7 @@
                 {{
                   row.rendimiento == "" || row.rendimiento == undefined
                     ? "-"
-                    : row.rendimiento
+                    : (row.rendimiento | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
@@ -578,7 +575,6 @@
       <div class="col-lg-3 col-md-4 col-sm-6">
         <h4>Cuota participación:</h4>
         <div class="field">
-          $USD
           {{ instrument_work_summary.cuota_participacion | number: "1.2-4" }}
         </div>
       </div>
@@ -586,11 +582,8 @@
       <div class="col-lg-3 col-md-4 col-sm-6">
         <h4>Valor participación:</h4>
         <div class="field">
-          {{
-            instrument_work_summary.valor_participacion_porcentaje
-              | number: "1.2-4"
-          }}
-          %
+          $USD
+          {{ instrument_work_summary.valor_participacion | number: "1.2-4" }}
         </div>
       </div>
 
@@ -729,7 +722,7 @@
                 {{
                   row.fecha_pago == "" || row.fecha_pago == undefined
                     ? "-"
-                    : row.fecha_pago
+                    : (row.fecha_pago | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef></td>
@@ -740,7 +733,7 @@
                 {{
                   row.ingreso_bruto == "" || row.ingreso_bruto == undefined
                     ? "-"
-                    : row.ingreso_bruto
+                    : (row.ingreso_bruto | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
@@ -756,7 +749,7 @@
                 {{
                   row.ingreso_neto == "" || row.ingreso_neto == undefined
                     ? "-"
-                    : row.ingreso_neto
+                    : (row.ingreso_neto | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
@@ -773,7 +766,7 @@
                   row.dividendo_porcentaje == "" ||
                   row.dividendo_porcentaje == undefined
                     ? "-"
-                    : row.dividendo_porcentaje
+                    : (row.dividendo_porcentaje | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
@@ -790,7 +783,7 @@
                   row.rendimiento_porcentaje == "" ||
                   row.rendimiento_porcentaje == undefined
                     ? "-"
-                    : row.rendimiento_porcentaje
+                    : (row.rendimiento_porcentaje | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
@@ -806,7 +799,7 @@
                 {{
                   row.rendimiento == "" || row.rendimiento == undefined
                     ? "-"
-                    : row.rendimiento
+                    : (row.rendimiento | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>

src/app/components/instruments/fondos/fondos.component.ts

@@ -95,7 +95,7 @@ export class FINV implements InstrumentComponent {
   operation_results_work: any = [];
   instrument_work_summary: any = [];
   cuota_participacion: any;
-  valor_participacion_porcentaje: any;
+  valor_participacion: any;
   dias_liquidacion: any;
   dias_vencimiento: any;
   valor_nominal: any;
@@ -162,10 +162,8 @@ export class FINV implements InstrumentComponent {
           Validators.pattern(/^[+]?([0-9]+(?:[\.][0-9]*)?|\.[0-9]+)$/)
         ]
       ],
-      valor_participacion_porcentaje: [
-        this.instrument_exists
-          ? ""
-          : this.instrument_work.valor_participacion_porcentaje,
+      valor_participacion: [
+        this.instrument_exists ? "" : this.instrument_work.valor_participacion,
         [
           Validators.required,
           Validators.pattern(/^[+]?([0-9]+(?:[\.][0-9]*)?|\.[0-9]+)$/)
@@ -279,8 +277,7 @@ export class FINV implements InstrumentComponent {
         },
         {
           cuota_participacion: +this.f.cuota_participacion.value,
-          valor_participacion_porcentaje: +this.f.valor_participacion_porcentaje
-            .value,
+          valor_participacion: +this.f.valor_participacion.value,
           comision_bolsa_porcentaje: +this.f.comision_bolsa_porcentaje.value,
           comision_casa_porcentaje: +this.f.comision_casa_porcentaje.value,
           dividendo_porcentaje: +this.f.dividendo_porcentaje.value,
@@ -294,8 +291,8 @@ export class FINV implements InstrumentComponent {
         ans => {
           this.cuota_participacion =
             ans["result"]["instrumento"]["cuota_participacion"];
-          this.valor_participacion_porcentaje =
-            ans["result"]["instrumento"]["valor_participacion_porcentaje"];
+          this.valor_participacion =
+            ans["result"]["instrumento"]["valor_participacion"];
           this.dias_liquidacion =
             ans["result"]["instrumento"]["dias_liquidacion"];
           this.dias_vencimiento =
@@ -339,8 +336,8 @@ export class FINV implements InstrumentComponent {
           this.fondosObject = {
             cuota_participacion: this.investmentProposalForm.value
               .cuota_participacion,
-            valor_participacion_porcentaje: this.investmentProposalForm.value
-              .valor_participacion_porcentaje,
+            valor_participacion: this.investmentProposalForm.value
+              .valor_participacion,
             comision_bolsa_porcentaje: this.investmentProposalForm.value
               .comision_bolsa_porcentaje,
             comision_casa_porcentaje: this.investmentProposalForm.value

src/app/components/instruments/futuros/futuros.component.html

@@ -54,21 +54,21 @@
 
       <div class="col-lg-6 col-sm-12 pr-xl-3">
         <div class="form-group">
-          <label for="ticket">Ticket: </label>
+          <label for="ticker">Ticker: </label>
           <div class="input-box-container">
             <p>
               <i class="fas fa-file-alt"></i>
             </p>
             <input
               type="text"
-              formControlName="ticket"
+              formControlName="ticker"
               class="form-control"
               [ngClass]="{
-                'is-invalid': submitted && f.ticket.errors
+                'is-invalid': submitted && f.ticker.errors
               }"
             />
-            <div *ngIf="submitted && f.ticket.errors" class="invalid-feedback">
-              <div *ngIf="f.ticket.errors.required">
+            <div *ngIf="submitted && f.ticker.errors" class="invalid-feedback">
+              <div *ngIf="f.ticker.errors.required">
                 Campo requerido
               </div>
             </div>
@@ -123,7 +123,7 @@
           <label for="comision_broker_compra">Comisión broker: </label>
           <div class="input-box-container">
             <p>
-              <i class="fas fa-percent"></i>
+              <i class="fas fa-dollar-sign"></i>
             </p>
             <input
               type="text"
@@ -366,7 +366,7 @@
           <label for="comision_broker_venta">Comisión broker: </label>
           <div class="input-box-container">
             <p>
-              <i class="fas fa-percent"></i>
+              <i class="fas fa-dollar-sign"></i>
             </p>
             <input
               type="text"
@@ -622,7 +622,7 @@
           <div class="col-sm-4">
             <h4>Comisión broker:</h4>
             <div class="field">
-              {{ comision_broker_compra | number: "1.2-4" }} %
+              $USD {{ comision_broker_compra | number: "1.2-4" }}
             </div>
           </div>
 
@@ -754,7 +754,7 @@
           <div class="col-sm-4">
             <h4>Comisión broker:</h4>
             <div class="field">
-              {{ comision_broker_venta | number: "1.2-4" }} %
+              $USD {{ comision_broker_venta | number: "1.2-4" }}
             </div>
           </div>
 
@@ -906,10 +906,10 @@
         <div class="col-sm-4">
           <h4>Comisión broker:</h4>
           <div class="field">
+            $USD
             {{
               instrument_work_summary.comision_broker_compra | number: "1.2-4"
             }}
-            %
           </div>
         </div>
 
@@ -1054,10 +1054,10 @@
         <div class="col-sm-4">
           <h4>Comisión broker:</h4>
           <div class="field">
+            $USD
             {{
               instrument_work_summary.comision_broker_venta | number: "1.2-4"
             }}
-            %
           </div>
         </div>
 

src/app/components/instruments/futuros/futuros.component.ts

@@ -151,7 +151,7 @@ export class FUTU implements InstrumentComponent {
     this.investmentProposalForm = this.formBuilder.group({
       operacion: [this.instrument_exists ? "" : this.instrument_work.corto],
       ejecucion: [this.instrument_exists ? "" : this.ejecucion],
-      ticket: [this.instrument_exists ? "" : this.instrument_work.ticket],
+      ticker: [this.instrument_exists ? "" : this.instrument_work.ticker],
       precio_unitario_compra: [
         this.instrument_exists
           ? ""
@@ -628,7 +628,7 @@ export class FUTU implements InstrumentComponent {
           this.futurosObject = {
             completo: this.tipoEjecucion,
             corto: this.tipoOperacion,
-            ticket: this.investmentProposalForm.value.ticket,
+            ticker: this.investmentProposalForm.value.ticker,
 
             fecha_inicio_vigencia: this.fecha_inicio_vigencia
           };

src/app/components/instruments/opciones/opciones.component.html

@@ -54,21 +54,21 @@
 
       <div class="col-lg-6 col-sm-12 pr-xl-3">
         <div class="form-group">
-          <label for="ticket">Ticket: </label>
+          <label for="ticker">Ticker: </label>
           <div class="input-box-container">
             <p>
               <i class="fas fa-file-alt"></i>
             </p>
             <input
               type="text"
-              formControlName="ticket"
+              formControlName="ticker"
               class="form-control"
               [ngClass]="{
-                'is-invalid': submitted && f.ticket.errors
+                'is-invalid': submitted && f.ticker.errors
               }"
             />
-            <div *ngIf="submitted && f.ticket.errors" class="invalid-feedback">
-              <div *ngIf="f.ticket.errors.required">
+            <div *ngIf="submitted && f.ticker.errors" class="invalid-feedback">
+              <div *ngIf="f.ticker.errors.required">
                 Campo requerido
               </div>
             </div>
@@ -123,7 +123,7 @@
           <label for="comision_broker_compra">Comisión broker: </label>
           <div class="input-box-container">
             <p>
-              <i class="fas fa-percent"></i>
+              <i class="fas fa-dollar-sign"></i>
             </p>
             <input
               type="text"
@@ -366,7 +366,7 @@
           <label for="comision_broker_venta">Comisión broker: </label>
           <div class="input-box-container">
             <p>
-              <i class="fas fa-percent"></i>
+              <i class="fas fa-dollar-sign"></i>
             </p>
             <input
               type="text"
@@ -622,7 +622,7 @@
           <div class="col-sm-4">
             <h4>Comisión broker:</h4>
             <div class="field">
-              {{ comision_broker_compra | number: "1.2-4" }} %
+              $USD {{ comision_broker_compra | number: "1.2-4" }}
             </div>
           </div>
 
@@ -654,7 +654,9 @@
 
           <div class="col-sm-4">
             <h4>Ganancia / pérdida:</h4>
-            <div class="field">$USD {{ ganancia_perdida | number: "1.2-4" }}</div>
+            <div class="field">
+              $USD {{ ganancia_perdida | number: "1.2-4" }}
+            </div>
           </div>
 
           <div class="col-sm-4">
@@ -752,7 +754,7 @@
           <div class="col-sm-4">
             <h4>Comisión broker:</h4>
             <div class="field">
-              {{ comision_broker_venta | number: "1.2-4" }} %
+              $USD {{ comision_broker_venta | number: "1.2-4" }}
             </div>
           </div>
 
@@ -865,6 +867,14 @@
 <div *ngIf="summary">
   <div class="timeline-body">
     <div class="row">
+      <div class="col-12">
+        <h3>
+          Ticker
+        </h3>
+        <div class="field">
+          {{ instrument_work_summary.ticker }}
+        </div>
+      </div>
       <!-- COMPRA -->
       <div class="col-12">
         <h3>
@@ -888,7 +898,9 @@
         *ngIf="
           operation_result == true &&
           (instrument_work_summary.corto == 0 ||
-            instrument_work_summary.completo == 1)
+            instrument_work_summary.completo == 1 ||
+              (instrument_work_summary.valor_pagado != '' &&
+                instrument_work_summary.valor_recibido != ''))
         "
       >
         <div class="col-sm-4">
@@ -904,10 +916,10 @@
         <div class="col-sm-4">
           <h4>Comisión broker:</h4>
           <div class="field">
+            $USD
             {{
               instrument_work_summary.comision_broker_compra | number: "1.2-4"
             }}
-            %
           </div>
         </div>
 
@@ -951,7 +963,8 @@
         <div class="col-sm-4">
           <h4>Ganancia / pérdida:</h4>
           <div class="field">
-            $USD {{ instrument_work_summary.ganancia_perdida | number: "1.2-4" }}
+            $USD
+            {{ instrument_work_summary.ganancia_perdida | number: "1.2-4" }}
           </div>
         </div>
 
@@ -1035,7 +1048,9 @@
         *ngIf="
           operation_result == true &&
           (instrument_work_summary.corto == 1 ||
-            instrument_work_summary.completo == 1)
+            instrument_work_summary.completo == 1 ||
+              (instrument_work_summary.valor_pagado != '' &&
+                instrument_work_summary.valor_recibido != ''))
         "
       >
         <div class="col-sm-4">
@@ -1051,10 +1066,10 @@
         <div class="col-sm-4">
           <h4>Comisión broker:</h4>
           <div class="field">
+            $USD
             {{
               instrument_work_summary.comision_broker_venta | number: "1.2-4"
             }}
-            %
           </div>
         </div>
 

src/app/components/instruments/opciones/opciones.component.ts

@@ -151,7 +151,7 @@ export class OPC implements InstrumentComponent {
     this.investmentProposalForm = this.formBuilder.group({
       operacion: [this.instrument_exists ? "" : this.instrument_work.corto],
       ejecucion: [this.instrument_exists ? "" : this.ejecucion],
-      ticket: [this.instrument_exists ? "" : this.instrument_work.ticket],
+      ticker: [this.instrument_exists ? "" : this.instrument_work.ticker],
       precio_unitario_compra: [
         this.instrument_exists
           ? ""
@@ -628,7 +628,7 @@ export class OPC implements InstrumentComponent {
           this.opcionesObject = {
             completo: this.tipoEjecucion,
             corto: this.tipoOperacion,
-            ticket: this.investmentProposalForm.value.ticket,
+            ticker: this.investmentProposalForm.value.ticker,
 
             fecha_inicio_vigencia: this.fecha_inicio_vigencia
           };

src/app/components/investment-proposals/payment-info/payment-info.component.html

@@ -137,7 +137,7 @@
                     <label for="emitir_nombre">Emitir a nombre: </label>
                     <div class="input-box-container">
                       <p>
-                        <i class="fas fa-dollar-sign"></i>
+                        <i class="far fa-envelope"></i>
                       </p>
                       <input
                         type="text"

src/app/components/login/login.component.html

@@ -4,7 +4,7 @@
       <div class="auth-box">
         <div class="card">
           <div class="top d-block d-lg-none">
-            <img alt="Inverlec" src="./assets/img/inverlec_logo.png" />
+            <img alt="Inverlec" src="./assets/img/inversys.png" />
           </div>
 
           <div class="header">
@@ -49,7 +49,7 @@
                 </div>
               </div>
 
-              <button class="btn btn-primary" type="submit">
+              <button class="btn btn-dark" type="submit">
                 Iniciar sesión
               </button>
             </form>

src/app/components/login/login.component.scss

@@ -29,7 +29,7 @@
   height: 100%;
   z-index: -1;
   background: url("/assets/img/test1.png") no-repeat left top;
-  background-color: #223d7d;
+  background-color: #4f3683; //#223d7d;
   background-size: cover;
   background-position: 10%;
 }
@@ -42,7 +42,7 @@
   width: 80%;
   height: 100%;
   z-index: -2;
-  background: url("/assets/img/inverlec_logo.png") no-repeat 70% center;
+  background: url("/assets/img/inversys.png") no-repeat 70% center;
   background-color: #fff;
   //background: url(../../assets/images/auth_bg.jpg) no-repeat top left fixed;
 }
@@ -95,7 +95,7 @@
 @media screen and (max-width: 768px) {
   .auth-main:before,
   .auth-main:after {
-    background-color: #223d7d;
+    background-color: #4f3683; //#223d7d;
   }
 
   .top {

src/app/components/shared/sidebar/sidebar.component.html

@@ -1,10 +1,10 @@
 <div class="logo">
-  <a class="simple-text logo-mini">
+  <a class="simple-text logo-mini" href="/">
     <div class="logo-img">
-      <img src="./assets/img/logo_inverlec_inv_p.png" />
+      &nbsp;
+      <!-- <img src="./assets/img/denmark-logo.png" /> -->
     </div>
   </a>
-  <a class="simple-text logo-normal" href="/">Inversiones</a>
 </div>
 
 <div class="sidebar-wrapper">
@@ -33,59 +33,23 @@
         <p>{{ menuItem.title }}</p>
       </a>
     </li>
-    <!--
-    <li class="nav-item" routerlinkactive="active">
-      <a class="nav-link" data-toggle="collapse" href="#catalogs">
-        <i class="material-icons">grid_on</i>
-        <p>Catálogos<b class="caret"></b></p>
-      </a>
-      <div class="collapse" id="catalogs">
-        <ul class="nav">
-          <li class="nav-item" routerlinkactive="active">
-            <a class="nav-link" href="#/companies">
-              <span class="sidebar-mini">EMP</span>
-              <span class="sidebar-normal">Empresas</span>
-            </a>
-          </li>
-          <li class="nav-item" routerlinkactive="active">
-            <a class="nav-link" href="#/countries">
-              <span class="sidebar-mini">PAI</span>
-              <span class="sidebar-normal">Países</span>
-            </a>
-          </li>
-          <li class="nav-item" routerlinkactive="active">
-            <a class="nav-link" href="#/emitters">
-              <span class="sidebar-mini">EMI</span>
-              <span class="sidebar-normal">Emisores</span>
-            </a>
-          </li>
-          <li class="nav-item" routerlinkactive="active">
-            <a class="nav-link" href="#">
-              <span class="sidebar-mini">C2</span>
-              <span class="sidebar-normal">Catalogo</span>
-            </a>
-          </li>
-        </ul>
-      </div>
-    </li>-->
+
     <hr />
   </ul>
 
-  <div *ngIf="isMobileMenu()">
-    <ul class="nav navbar-nav nav-mobile-menu-bottom">
-      <li class="nav-item">
-        <a
-          class="nav-link"
-          title="Logout"
-          (click)="logout()"
-          href="javascript:void(0)"
-        >
-          <i class="material-icons">exit_to_app</i>
-          <p>
-            <span class="d-lg-none d-md-block">Logout</span>
-          </p>
-        </a>
-      </li>
-    </ul>
-  </div>
+  <ul class="nav navbar-nav nav-mobile-menu-bottom">
+    <li class="nav-item">
+      <a
+        class="nav-link"
+        title="Cerrar sesión"
+        (click)="logout()"
+        href="javascript:void(0)"
+      >
+        <i class="material-icons">exit_to_app</i>
+        <p>
+          Cerrar sesión
+        </p>
+      </a>
+    </li>
+  </ul>
 </div>

src/app/services/instrument-calculations.service.ts

@@ -176,7 +176,7 @@ export class InstrumentCalculations {
     },
     info_instrumento: {
       cuota_participacion: number;
-      valor_participacion_porcentaje: number;
+      valor_participacion: number;
       comision_bolsa_porcentaje: number;
       comision_casa_porcentaje: number;
       dividendo_porcentaje: number;

src/assets/scss/core/_sidebar-and-main-panel.scss

@@ -11,7 +11,7 @@
   left: 0;
   z-index: 2;
   width: 240px;
-  background: #23272d;
+  background: $sidebar-color;
   @include shadow-big();
 
   .caret {
@@ -29,18 +29,22 @@
   &[data-background-color="black"] {
     background-color: #191919;
   }
+
   .logo-img {
-    width: 35px;
+    width: 240px;
     display: block;
-    max-height: 30px;
-    margin-left: 0;
+    height: 50px;
+    margin-left: 5px;
     margin-right: 15px;
-
+    background: url(/assets/img/inversys1.png) no-repeat;
+    background-size: 220px;
+    /*
     img {
-      width: 45px;
-      top: 35px;
+      width: 215px;
+      top: 10px;
       position: absolute;
-    }
+      left: 15px;
+    }*/
   }
   .sidebar-wrapper {
     position: relative;
@@ -144,7 +148,7 @@
       & .dropdown-menu a:hover,
       & .dropdown-menu a:focus,
       &.active > [data-toggle="collapse"] {
-        background-color: rgba(200, 200, 200, 0.2);
+        background-color: #aaa;
         color: $white;
         box-shadow: none;
       }
@@ -195,7 +199,7 @@
       line-height: 30px;
       width: 30px;
       text-align: center;
-      color: #a9afbb;
+      color: $purple;
     }
   }
 
@@ -203,7 +207,7 @@
   .nav li .dropdown-menu a {
     margin: 10px 10px 0;
     border-radius: $border-radius-base;
-    color: $gray-light;
+    color: $purple;
     padding-left: 10px;
     padding-right: 10px;
     text-transform: capitalize;
@@ -326,7 +330,7 @@
     @include set-background-color-button($yellow-custom);
   }
   &[data-color="blue"] {
-    @include set-background-color-button($blue-custom);
+    @include set-background-color-button($purple);
   }
   &[data-color="white"] {
     @include set-background-color-button($white-color);
@@ -477,6 +481,17 @@
       font-weight: 200;
       z-index: 9999;
 
+      .logo-img {
+        width: 70px;
+        display: block;
+        overflow: hidden;
+        background: url(/assets/img/inversys_mini1.png) no-repeat;
+        background-size: 55px;
+        background-position-y: 0px;
+        height: 70px;
+        background-position-x: center;
+      }
+
       .logo {
         a.logo-normal {
           opacity: 0;

src/assets/scss/core/variables/_bootstrap-material-design-base.scss

@@ -1,8 +1,13 @@
 $gray-lighter: rgba($black, 0.12) !default;
 $gray-light: #999 !default;
-$gray-alpha: .54 !default;
+$gray-alpha: 0.54 !default;
 $gray: #555 !default; // spec color
-$gray-dark: rgba($black, 0.87) !default; // used for text color - others use grey-600 which is considerably lighter
+$gray-dark: rgba(
+  $black,
+  0.87
+) !default; // used for text color - others use grey-600 which is considerably lighter
+
+$purple: #4f3683;
 
 $bmd-font-weight-base: 400;
 
@@ -22,12 +27,12 @@ $border-radius-label: 12px !default;
 $border-radius-extreme: 30px !default;
 
 // Typography elements
-$mdb-font-family: 'Roboto', 'Helvetica', 'Arial', sans-serif !default;
-$mdb-text-color-light:  $white !default;
+$mdb-font-family: "Roboto", "Helvetica", "Arial", sans-serif !default;
+$mdb-text-color-light: $white !default;
 $mdb-text-color-light-hex: $white !default; // for contrast function in inverse
 $mdb-text-color-primary: unquote("rgba(#{$rgb-black}, 0.87)") !default;
 $mdb-text-color-primary-hex: $black !default; // for contrast function in inverse
-$icon-color: rgba(0,0,0,0.5) !default;
+$icon-color: rgba(0, 0, 0, 0.5) !default;
 
 $mdb-label-color: unquote("rgba(#{$rgb-black}, 0.26)") !default;
 $mdb-label-color-toggle-focus: unquote("rgba(#{$rgb-black}, .54)") !default;

src/assets/scss/core/variables/_colors.scss

@@ -332,4 +332,4 @@ $palette-yellow: #fad35e;
 $palette-dark-yellow: #ee964b;
 $palette-orange: #f95738;
 
-$sidebar-color: #23272d;
+$sidebar-color: #fff; // #23272d;