Browse Source

Modificaciones Jean

JeanBenitez 2 năm trước cách đây
mục cha
commit
b66a79eac1

+ 3 - 0
sistema-mantenimiento-front/angular.json

@@ -1,5 +1,8 @@
 {
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "cli": {
+    "analytics": "51de92c9-866b-4400-921d-8930f301a11a"
+  },
   "version": 1,
   "newProjectRoot": "projects",
   "projects": {

+ 8 - 37
sistema-mantenimiento-front/src/app/components/acquisition-management/acquisition/purchase-line/purchase-line.component.html

@@ -16,40 +16,16 @@
       <!-- TÍTULO -->
       <mat-card-title class="mat-card-title centre">Líneas de Solicitud de Compra</mat-card-title>
 
-      <!-- RECARGAR, BUSCADOR Y BOTÓN DE REGISTRO -->
-      <!-- <nav class="w-100 actions-container">
-
-        <div class="action-reload">
-          <button mat-fab color="info" class="btn-reload" matTooltip="Actualizar Datos">
-            <mat-icon>refresh</mat-icon>
-          </button>
-        </div>
-
-        <div class="action-filter">
-          <mat-form-field class="input-filter">
-            <mat-label>Buscador</mat-label>
-            <input matInput (keyup)="applyFilter($event)" placeholder="Ingrese la palabra a buscar">
-            <mat-icon matSuffix>search</mat-icon>
-          </mat-form-field>
-        </div>
-
-        <div class="action-register">
-          <button mat-raised-button color="primary" [routerLink]="['/sam/shopping']" [disabled]="isLoadingForm"
-            class="btn-new-register" *ngIf="!btnSmall">
-            <mat-icon>add</mat-icon> Registrar Nueva Línea
-          </button>
-          <button mat-mini-fab color="primary" [disabled]="isLoadingForm" *ngIf="btnSmall"
-            matTooltip="Registrar Líneas de Solicitud">
-            <mat-icon>add</mat-icon>
-          </button>
-        </div>
-      </nav> -->
+      <nav style=" display: flex; justify-content: space-between; padding: 0 20px; margin-bottom: 15px;">
+        <mat-form-field appearance="outline" style="width: 300px;">
+          <mat-label>Buscador</mat-label>
+          <input matInput (keyup)="applyFilter($event)" placeholder="Ingrese la palabra a buscar">
+          <mat-icon matSuffix>search</mat-icon>
+        </mat-form-field>
 
-      <nav style="height: 56px; display: flex; justify-content: space-between; padding: 0 20px; margin-bottom: 15px;">
-        <!-- BOTÓN PARA RECARGAR LA TABLA -->
         <div style="display: flex; height: 56px; align-items: center;">
-          <button mat-raised-button color="primary" [routerLink]="['/sam/shopping']" [disabled]="isLoadingForm" *ngIf="!btnSmall" style="margin-right: 10px;" class="btn-noshadow">
-            <mat-icon>add</mat-icon> Registrar Nueva Línea
+          <button mat-raised-button color="primary" matTooltip="Registrar Línea de Solicitud" [routerLink]="['/sam/shopping']" [disabled]="isLoadingForm" *ngIf="!btnSmall" style="margin-right: 10px;" class="btn-noshadow">
+            <mat-icon>add</mat-icon> Nuevo
           </button>
           <button mat-mini-fab color="primary" class="mr-8" [disabled]="isLoadingForm" *ngIf="btnSmall" matTooltip="Registrar Nueva Línea">
             <mat-icon>add</mat-icon>
@@ -58,11 +34,6 @@
             <mat-icon>refresh</mat-icon>
           </button>
         </div>
-        <mat-form-field appearance="outline" style="width: 300px;">
-          <mat-label>Buscador</mat-label>
-          <input matInput (keyup)="applyFilter($event)" placeholder="Ingrese la palabra a buscar">
-          <mat-icon matSuffix>search</mat-icon>
-        </mat-form-field>
       </nav>
 
       <div class="is-loading animated fadeIn fast" *ngIf="isLoading">

+ 42 - 42
sistema-mantenimiento-front/src/app/components/login/login.component.html

@@ -1,44 +1,44 @@
-<!-- <body background="assets/img/background-login.png" style="width: 100%;">
-
-</body> -->
-
-
-<body background="../../../assets/img/background-login.png" class="background-img">
-    <div class="menu-align">
-        <mat-card class="card-inicio mat-elevation-z8 animated fadeIn fast centre" (window:resize)="onResize($event)">
-            <div class="w-100">
-                <div class="card-formulario card-formulario-small">
-                    <form [formGroup]="formGroup" style="padding: 90px;">
-                        <h1 class="inicio" style="margin-top: 35px; color: #808080;">Inicio de Sesión</h1>
-                        <mat-form-field >
-                            <mat-label>Correo Electrónico</mat-label>
-                            <input matInput placeholder="Ingrese el correo electrónico" formControlName="email"
-                                required (keyup.enter)="login()" tabindex="1"/>
-                            <mat-icon matSuffix>email</mat-icon>
-                        </mat-form-field>
-                        <mat-form-field  style="margin-top: 25px;">
-                            <mat-label>Contraseña</mat-label>
-                            <input matInput [type]="hide ? 'password' : 'text'" placeholder="Ingrese la contraseña"
-                                formControlName="password" required (keyup.enter)="login()" tabindex="2"/>
-                            <button mat-icon-button matSuffix (click)="hide = !hide" [attr.aria-label]="'Hide password'"
-                                [attr.aria-pressed]="hide" tabindex="4">
-                                <mat-icon>{{hide ? 'visibility_off' : 'visibility'}}</mat-icon>
-                            </button>
-                        </mat-form-field>
-                        <div class="mt-16">
-                            <button mat-raised-button class="pink_primary_background white_font"
-                                matTooltip="Iniciar Sesion" (click)="login()" tabindex="3">
-                                Iniciar sesión
-                            </button>
-                        </div>
-                    </form>
-                </div>
-
-                <div class="card-formulario">
-                    <img src="../../../assets/img/img-login.png" class="img-login m-55" width="500" />
-                </div>
+<body
+  background="../../../assets/img/background-login.png"
+  class="background-img"
+>
+  <div class="menu-align">
+    <mat-card
+      class="card-inicio mat-elevation-z8 animated fadeIn fast centre"
+      (window:resize)="onResize($event)"
+    >
+      <div class="w-100">
+        <div class="card-formulario card-formulario-small">
+          <form [formGroup]="formGroup" style="padding: 90px">
+            <h1 class="inicio" style="margin-top: 35px; color: #808080"> Inicio de Sesión </h1>
+            <mat-form-field>
+              <mat-label>Correo Electrónico</mat-label>
+              <input matInput placeholder="Ingrese el correo electrónico" formControlName="email" required (keyup.enter)="login()" tabindex="1"/>
+              <mat-icon matSuffix>email</mat-icon>
+            </mat-form-field>
+            <mat-form-field style="margin-top: 25px">
+              <mat-label>Contraseña</mat-label>
+              <input matInput [type]="hide ? 'password' : 'text'" placeholder="Ingrese la contraseña" formControlName="password" required (keyup.enter)="login()" tabindex="2"/>
+              <a mat-icon-button matSuffix (click)="hide = !hide" [attr.aria-label]="'Hide password'" [attr.aria-pressed]="hide" tabindex="4">
+                <mat-icon>{{ hide ? "visibility_off" : "visibility" }}</mat-icon>
+              </a>
+            </mat-form-field>
+            <div class="mt-16">
+              <button mat-raised-button class="pink_primary_background white_font" matTooltip="Iniciar Sesion" (click)="login()" tabindex="3">
+                Iniciar sesión
+              </button>
             </div>
-        </mat-card>
-    </div>
-</body>
+          </form>
+        </div>
 
+        <div class="card-formulario">
+          <img
+            src="../../../assets/img/img-login.png"
+            class="img-login m-55"
+            width="500"
+          />
+        </div>
+      </div>
+    </mat-card>
+  </div>
+</body>

+ 8 - 9
sistema-mantenimiento-front/src/styles.css

@@ -55,16 +55,16 @@ body {
 }
 
 .nav-option{
-  height: 56px; 
-  display: flex; 
-  justify-content: space-between; 
-  padding: 0 20px; 
+  height: 56px;
+  display: flex;
+  justify-content: space-between;
+  padding: 0 20px;
   margin-bottom: 15px;
 }
 
 .nav-action{
-  display: flex; 
-  height: 56px; 
+  display: flex;
+  height: 56px;
   align-items: center;
 }
 /* Paddings */
@@ -610,11 +610,10 @@ all {
 }
 
 .main-container {
-  /* padding-top: 2%; */
-  /* padding-bottom: 2%; */
+  width: 100%;
   height: 100%;
   overflow: auto;
-  background-color: #FFFFFF;
+  /* background-color: #FFFFFF; */
 }
 
 .title-card {