refactor: Remove bootstrap styles

CarlosPavajeau · Mar 18, 2021 · 589bf25 · 589bf25
1 parent 2d5e606
commit 589bf25
Show file tree

Hide file tree

Showing 5 changed files with 456 additions and 19 deletions.
diff --git a/Kaizen/ClientApp/angular.json b/Kaizen/ClientApp/angular.json
@@ -26,7 +26,6 @@
             ],
             "styles": [
               "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
-              "node_modules/bootstrap/dist/css/bootstrap.min.css",
               "src/styles.scss"
             ],
             "scripts": []

diff --git a/...p/modules/activity-schedule/components/activity-schedule/activity-schedule.component.html b/...p/modules/activity-schedule/components/activity-schedule/activity-schedule.component.html
@@ -1,10 +1,10 @@
 <div class="container">
-  <div class="calendar-header">
+  <mat-toolbar>
     <div class="calendar-control">
       <button mat-stroked-button class="mr-3" (click)="showCurrentDate()">
         Hoy
       </button>
-      <div style="display: inline-block">
+      <div style="display: inline-block" class="mr-4">
         <button
           mat-icon-button
           [matTooltip]="previousMessages[view]"
@@ -20,19 +20,20 @@
           <mat-icon>navigate_next</mat-icon>
         </button>
       </div>
-      <ng-container
-        *ngIf="activities$ | observableWithStatus | async as obs"
-        [ngSwitch]="obs.status"
-      >
-        <ng-template [ngSwitchCase]="ObsStatus.Loading">
-          <div class="loading-option">
-            <mat-spinner [diameter]="20"></mat-spinner>
-            <span>Cargando actividades...</span>
-          </div>
-        </ng-template>
-      </ng-container>
     </div>
-    <div class="calendar-control float-right">
+    <ng-container
+      *ngIf="activities$ | observableWithStatus | async as obs"
+      [ngSwitch]="obs.status"
+    >
+      <ng-template [ngSwitchCase]="ObsStatus.Loading">
+        <div class="loading-option">
+          <mat-spinner [diameter]="20"></mat-spinner>
+          <span>Cargando actividades...</span>
+        </div>
+      </ng-template>
+    </ng-container>
+    <div class="spacer"></div>
+    <div class="calendar-control">
       <button mat-icon-button class="mr-2"><mat-icon>search</mat-icon></button>
       <button mat-stroked-button [matMenuTriggerFor]="menu">
         {{ activityScheduleViewNames[view] }}
@@ -46,7 +47,7 @@
         <button mat-menu-item (click)="setView(ScheduleView.Day)">Día</button>
       </mat-menu>
     </div>
-  </div>
+  </mat-toolbar>
   <mat-divider></mat-divider>
   <div class="calendar">
     <app-activity-schedule-month

diff --git a/...app/modules/activity-schedule/components/activity-schedule/activity-schedule.component.ts b/...app/modules/activity-schedule/components/activity-schedule/activity-schedule.component.ts
@@ -7,6 +7,7 @@ import { ActivityScheduleService } from '@modules/activity-schedule/services/act
 import { ObservableStatus } from '@shared/models/observable-with-status';
 import * as moment from 'moment';
 import { Observable } from 'rxjs';
+import { delay } from 'rxjs/operators';
 
 @Component({
   selector: 'app-activity-schedule',
@@ -37,7 +38,7 @@ export class ActivityScheduleComponent implements OnInit {
   }
 
   private loadData(): void {
-    this.activities$ = this.activityScheduleService.getActivities();
+    this.activities$ = this.activityScheduleService.getActivities().pipe(delay(3000));
     this.activities$.subscribe((activities) => {
       this.activities = activities;
       this.onLoadData();

diff --git a/...ientApp/src/app/modules/clients/components/client-register/client-register.component.html b/...ientApp/src/app/modules/clients/components/client-register/client-register.component.html
@@ -1,4 +1,4 @@
-<div class="container">
+<div class="main-container mt-4 mb-3">
   <section>
     <mat-card>
       <mat-card-header>
@@ -15,7 +15,7 @@ <h1>Registro de cliente</h1>
                 <mat-form-field>
                   <mat-label>Identificación</mat-label>
                   <input
-                    type="tex"
+                    type="text"
                     matInput
                     placeholder="Ejemplo: 14234353"
                     formControlName="id"