Skip to content

Commit

Permalink
Merge pull request #13 from QXIP/develop
Browse files Browse the repository at this point in the history
fix bugs #11 #8 #9
  • Loading branch information
RFbkak37y3kIY authored Dec 16, 2024
2 parents adc6dc3 + bb3f8ad commit 84ba4fd
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 9 deletions.
4 changes: 2 additions & 2 deletions src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ import { WiregasmService } from './services/wiregasm.service';
</div>
<div class="init-status-wrapper" [ngClass]="{ready: isReady}" [hidden]="done">
<div class="init-status">
<div *ngFor="let item of msg">WASM-LIB: {{item || '. . .'}}</div>
<div *ngFor="let item of msg">WASM-LIB: {{item }}</div>
</div>
</div>
<router-outlet></router-outlet>`,
styleUrls: ['./app.component.scss'],

})
export class AppComponent {
msg: string[] = [' '];
msg: string[] = ['Loading ...'];
done = false;
isReady = false;
parsingProgress = 100;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<button mat-button>loading...</button>
</div>
<div *ngIf="menuTree">
<a href="/">
<a (click)="gotoUploadPage()">
<!-- <button mat-icon-button> -->
<mat-icon mat-list-icon color="primary" style="margin: 5px; float: left"
>note</mat-icon
Expand All @@ -11,7 +11,7 @@
</a>
<button
mat-button
*ngFor="let item of [m01, m02, m03, m04, m05]; let idx = index"
*ngFor="let item of [m05]; let idx = index"
[matMenuTriggerFor]="item"
>
{{ menuTree[idx].name }}
Expand Down
11 changes: 8 additions & 3 deletions src/app/components/controls/menu-stat/menu-stat.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { Component, OnInit, ChangeDetectorRef } from '@angular/core';
import { WebSharkDataService } from '@app/services/web-shark-data.service';
import { ModalResizableService } from '../modal-resizable/modal-resizable.service';
import { WiregasmService } from '@app/services/wiregasm.service';
import { Router } from '@angular/router';

@Component({
selector: 'app-menu-stat',
Expand All @@ -14,7 +15,8 @@ export class MenuStatComponent implements OnInit {
constructor(
private webSharkDataService: WiregasmService,
private modalResizableService: ModalResizableService,
private cdr: ChangeDetectorRef
private cdr: ChangeDetectorRef,
private router: Router
) { }

async ngOnInit() {
Expand All @@ -37,14 +39,14 @@ export class MenuStatComponent implements OnInit {
} = info;

const menuCollection = [
{ name: 'Endpoints', children: [...convs] },
{ name: 'Misc', children: [...convs] },
{ name: 'Response Time', children: [...srt, ...rtd] },
{ name: 'Statistics', children: [...stats, ...nstat] },
{ name: 'Export Objects', children: [...eo] },
{
name: 'Misc', children: [
{
name: 'RTP Rteams',
name: 'RTP Streams',
type: 'rtp-streams',
jsonData: {}
},
Expand All @@ -67,4 +69,7 @@ export class MenuStatComponent implements OnInit {
console.error(err);
}
}
gotoUploadPage() {
location.reload();
}
}
4 changes: 2 additions & 2 deletions src/app/components/controls/webshark/webshark.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div style="min-width: 200px; margin-bottom: 1rem" [style.height]="true || isKIOSK ? '60vh' : '100px'">
<pcap-uploader [autoUpload]="true"></pcap-uploader>
</div>
<mat-list *ngIf="false && !isKIOSK">
<!-- <mat-list *ngIf="false && !isKIOSK">
<h1 mat-subheader>Files</h1>
<div *ngFor="let note of fileList" class="list-item-hover" (click)="onClickFile(note.name)">
<mat-list-item>
Expand All @@ -22,7 +22,7 @@ <h1 mat-subheader>Files</h1>
<div mat-line>{{ note.size }} bytes</div>
</mat-list-item>
</div>
</mat-list>
</mat-list> -->
</div>
</div>
<div class="flex-container" style="flex: 1;" *ngIf="!(!(dataTree.length > 0) && !(detailsTable.length > 0))">
Expand Down

0 comments on commit 84ba4fd

Please sign in to comment.