Merge branch 'development' of onunez/soma-frontend into master

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

@@ -3,7 +3,7 @@
     <div class="vertical-align-middle auth-main">
       <div class="auth-box">
         <div class="top">
-          <img alt="Inverlec" src="./assets/img/inverlec_logo.png">
+          <img alt="INVERLEC - DENMARK" src="./assets/img/denmark-logo.png" />
         </div>
         <div class="card">
           <div class="header">
@@ -14,24 +14,42 @@
               <div class="form-group">
                 <label for="email">Correo electrónico</label>
 
-                <input type="text" name="email" class="form-control"
-                formControlName="email" [ngClass]="{ 'is-invalid': submitted && f.email.errors }" email/>
-                <div *ngIf="submitted && f.email.errors" class="invalid-feedback">
+                <input
+                  type="text"
+                  name="email"
+                  class="form-control"
+                  formControlName="email"
+                  [ngClass]="{ 'is-invalid': submitted && f.email.errors }"
+                  email
+                />
+                <div
+                  *ngIf="submitted && f.email.errors"
+                  class="invalid-feedback"
+                >
                   <div>Ingresar un correo válido</div>
                 </div>
-  
               </div>
               <div class="form-group">
                 <label for="password">Contraseña</label>
-                <input type="password" name="password"  class="form-control"
-                formControlName="password" minlength="5"  [ngClass]="{ 'is-invalid': submitted && f.password.errors }"/>
-                <div *ngIf="submitted && f.password.errors" class="invalid-feedback">
-                  <div *ngIf="f.password.errors.required">Ingresar contraseña</div>
+                <input
+                  type="password"
+                  name="password"
+                  class="form-control"
+                  formControlName="password"
+                  minlength="5"
+                  [ngClass]="{ 'is-invalid': submitted && f.password.errors }"
+                />
+                <div
+                  *ngIf="submitted && f.password.errors"
+                  class="invalid-feedback"
+                >
+                  <div *ngIf="f.password.errors.required">
+                    Ingresar contraseña
+                  </div>
                 </div>
-  
               </div>
-  
-              <button class="btn btn-primary" type="submit"> 
+
+              <button class="btn btn-primary" type="submit">
                 Iniciar sesión
               </button>
             </form>

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

@@ -11,59 +11,73 @@
 }
 
 .auth-box {
-  width: 400px;
+  width: 450px;
   height: auto;
-  margin-left: 130px;
+  margin-left: 115px;
 
   .card {
     padding: 25px;
   }
+}
+
+.top {
+  height: 110px;
 
+  img {
+    width: 100%;
+    max-width: 380px;
+  }
 }
 
 .auth-main::before {
-  content: '';
+  content: "";
   position: absolute;
   left: 0;
   top: 0;
-  width: 450px;
+  width: 500px;
   height: 100%;
   z-index: -1;
   background: #f0f0f0;
 }
 
 .auth-main:after {
-  content: '';
+  content: "";
   position: absolute;
   right: 0;
   top: 0;
   width: 100%;
   height: 100%;
   z-index: -2;
-  background: #223d7d;
+  background: #0b4583;
   //background: url(../../assets/images/auth_bg.jpg) no-repeat top left fixed;
 }
 
 .card {
   background: #fff;
-  transition: .5s;
+  transition: 0.5s;
   border: 0;
   margin-bottom: 30px;
-  border-radius: .55rem;
+  border-radius: 0.55rem;
   position: relative;
   width: 100%;
-  box-shadow: 0 1px 2px 0 rgba(0,0,0,0.1);
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.1);
 }
 
 @media screen and (max-width: 640px) {
   .auth-box {
-      width: 90%;
+    width: 90%;
+  }
+  .top {
+    img {
+      width: 100%;
+      max-width: 300px;
+    }
   }
 }
 
 @media screen and (max-width: 992px) {
   .auth-box {
-      width: 80%;
-      margin: 0 auto;
+    width: 80%;
+    margin: 0 auto;
   }
 }

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

@@ -476,11 +476,11 @@
       z-index: 9999;
 
       .logo-img {
-        width: 80px;
+        width: 70px;
         display: block;
         overflow: hidden;
         background: url(/assets/img/denmark-small-logo.png) no-repeat;
-        background-size: 80px;
+        background-size: 70px;
         background-position-y: 0px;
       }
 

src/environments/environment.ts

@@ -6,8 +6,8 @@ export const environment = {
   production: false,
   apiUrl: "https://api.inverlec.solar",
   //productionApiUrl: 'http://192.168.98.10:8888/api/v1',
-  productionApiUrl: "http://192.168.98.24:5000/api/v1",
-  //productionApiUrl: "https://denmark.inverlec.solar/api/v1",
+  //productionApiUrl: "http://192.168.98.24:5000/api/v1",
+  productionApiUrl: "https://denmark.inverlec.solar/api/v1",
   appID: "55899b9ea53834f2736b65a3582b734b",
   gKey: "",
   config: {