server 404. or error server will auto redirect to login page;\n login…

… page: if serveris /,will not show serverUrl field \n exitnode,subnets all disable will show gray color tag
401U · Mar 24, 2023 · abff4bc · abff4bc
1 parent 0ede220
commit abff4bc
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/src/app/http-api.interceptor.ts b/src/app/http-api.interceptor.ts
@@ -29,6 +29,10 @@ export class HttpApiInterceptor implements HttpInterceptor {
         localStorage.setItem('serverKey', '');
         this.router.navigateByUrl('/login');
       }
+      if (error.status === 404 || error.status == 0) {
+        this.router.navigateByUrl('/login');
+      }
+      console.log(error)
       return of(error)
     }));
   }

diff --git a/src/app/views/login/login.component.html b/src/app/views/login/login.component.html
@@ -1,7 +1,9 @@
 <nz-card style="width:450px; left:calc(50% - 225px);position: fixed; top:calc(50% - 160px)"
          [nzTitle]="titleTpl" [nzExtra]="extraTemplate">
-  <p>Server Url:</p>
-  <p>{{serverUrl}}</p>
+  <ng-container *ngIf="serverUrl && serverUrl!=='/'">
+    <p>Server Url:</p>
+    <p>{{serverUrl}}</p>
+  </ng-container>
   <p>ApiKeys:</p>
   <p><input nz-input [(ngModel)]="apiKeys"/></p>
   <p>

diff --git a/src/app/views/machine-manager/machine-manager.component.html b/src/app/views/machine-manager/machine-manager.component.html
@@ -39,11 +39,19 @@
         <nz-tag nzColor="red" *ngIf="!data.online">Offline</nz-tag>
         <ng-container *ngIf="data.subnets && data.subnets.length>0">
           <nz-tag nzColor="magenta" *ngIf="data.subnets_enabled_num>0">
-            SubNet {{data.subnets_enabled_num}}/{{data.subnets.length}}</nz-tag>
+            SubNet {{data.subnets_enabled_num}}/{{data.subnets.length}}
+          </nz-tag>
+          <nz-tag nzColor="default" *ngIf="data.subnets_enabled_num<=0">
+            SubNet {{data.subnets_enabled_num}}/{{data.subnets.length}}
+          </nz-tag>
         </ng-container>
         <ng-container *ngIf="data.exitNodes && data.exitNodes.length>0">
-          <nz-tag nzColor="geekblue" *ngIf="data.exitNode_enabled_num>0">ExitNode {{data.exitNode_enabled_num}}
-            /{{data.exitNodes.length}}</nz-tag>
+          <nz-tag nzColor="geekblue" *ngIf="data.exitNode_enabled_num>0">
+            ExitNode {{data.exitNode_enabled_num}}/{{data.exitNodes.length}}
+          </nz-tag>
+          <nz-tag nzColor="default" *ngIf="data.exitNode_enabled_num<=0">
+            ExitNode {{data.exitNode_enabled_num}}/{{data.exitNodes.length}}
+          </nz-tag>
         </ng-container>
 
       </td>