AutoTable: change button to icon

PMS/ClientApp/src/app/components/shared/auto-table-hl/auto-table-hl.component.html

@@ -70,7 +70,7 @@
                     <ng-template [ngIf]="!isCustomContent">
                         <div *ngIf="header.FIELD_NAME == 'EDIT'; then showEdit; else showData"></div>
                         <ng-template #showEdit>
-                            <button mat-raised-button (click)="editBtnClick(row)">
+                            <button mat-icon-button (click)="editBtnClick(row)">
                                 <i class="material-icons">edit</i>
                             </button>
                         </ng-template>

PMS/ClientApp/src/app/components/shared/auto-table/auto-table.component.html

@@ -71,7 +71,7 @@
                     <ng-template [ngIf]="!isCustomContent">
                         <div *ngIf="header.FIELD_NAME == 'EDIT'; then showEdit; else showData"></div>
                         <ng-template #showEdit>
-                            <button mat-raised-button (click)="editBtnClick(row)">
+                            <button mat-icon-button (click)="editBtnClick(row)">
                                 <i class="material-icons">edit</i>
                             </button>
                         </ng-template>

PMS/ClientApp/src/app/components/shared/mega-menu/mega-menu.component.html

@@ -83,7 +83,7 @@
 
 <dialog-template-caller title="Folder name" #dialog width="70%" height="90vh">
   <ng-template>
-    <div class="row">
+    <div class="row mt-2 mb-2">
       <div class="col-md-8">
         <div>
           <mat-form-field style="width:400px;">

PMS/ClientApp/src/app/core/auth-guard.service.ts

@@ -62,6 +62,8 @@ export class AuthGuardMain implements CanActivate {
                 }
             }),
             catchError(() => {
+                console.log("err");
+                
                 this.auth.clearToken();
                 this.router.navigate(['/login'])
                 return of(false);

PMS/ClientApp/src/app/core/auth-service.service.ts

@@ -47,7 +47,7 @@ export class AuthService {
                         this.router.navigate(["/login"])
                     }
 
-                    return of([])
+                    return of(null)
                 })
             )
     }

PMS/ClientApp/src/app/pages/login/login.component.css

 .container#portal-container {
-  margin-top: 5vh;
+  /* margin-top: 5vh; */
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
 }
 
-form#loginForm, .information-box {
+form#loginForm,
+.information-box {
   box-shadow: 0px 0px 2px 0px #b4b4b4;
 }
 
+.information-box {
+  padding: calc(1rem - 2px) !important;
+}
+
 .header-logo {
   height: 100%;
   width: 100%;

PMS/ClientApp/src/app/pages/login/login.component.html

@@ -53,7 +53,7 @@
 
     </div>
 
-    <div class="col-md-8 bg-white border rounded p-3 information-box">
+    <div class="col-md-8 bg-white border rounded information-box">
 
       <div class="row">
         <div class="col-md-12">
@@ -63,11 +63,11 @@
           </div>
         </div>
       </div>
-      <mat-divider class="mt-2 mb-2"></mat-divider>
-      <div class="row">
+      <!-- <mat-divider class="mt-2 mb-2"></mat-divider> -->
+      <!-- <div class="row">
         <div class="col-md-12">
           <div class="form-group">
-            <h5>Contract person</h5>
+            <h5>Contact person</h5>
 
             <table style="width:100%;font-size:10pt;margin-left:16px">
               <tr style="border-bottom:1px solid #f5f5f5">
@@ -141,19 +141,9 @@
             </table>
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
 
   </div>
 </div>
-<div style="height:50px"></div>
-
-<!--<div class="col-sm-3" style="background-color:#c3002f;height:60px;">rgb(195, 0, 47)</div>
-<div class="col-sm-3" style="background-color:#ebebeb;height:60px;">rgb(238, 238, 238)</div>
-<div class="col-sm-3" style="background-color:#d0d0d0;height:60px;"></div>
-<div class="col-sm-3" style="background-color:#cccccc;height:60px;"></div>
-<div class="col-sm-3" style="background-color:#bdbdbd;height:60px;"></div>
-
-<div class="col-sm-3" style="background-color:#999999;height:60px;"></div>
-<div class="col-sm-3" style="background-color:#666666;height:60px;"></div>
-<div class="col-sm-3" style="background-color:#4c4c4c;height:60px;"></div>-->
\ No newline at end of file
+<div style="height:50px"></div>
\ No newline at end of file

PMS/ClientApp/src/environments/environment.ts

@@ -4,7 +4,7 @@
 
 export const environment = {
   production: false,
-  apiLocation: 'http://localhost:8090/api/',
+  apiLocation: 'http://th-nmt-pmsq01:8090/api/',
   report: {
     url: 'http://192.168.1.250/ReportServer',
     rootPath: 'PMS_Rep'