Skip to content

Commit 4624a66

Browse files
committed
feat: refactor layout and styling for active directory components
Signed-off-by: Manuel Abascal <mjabascal10@gmail.com>
1 parent 04ae6c9 commit 4624a66

12 files changed

Lines changed: 54 additions & 29 deletions

frontend/src/app/active-directory/active-directory.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<div style="height: 89vh;" class="vul-container container-fluid pr-3 pl-3 pt-2">
2-
<div class="d-flex justify-content-between align-items-center mb-2 tab-header">
1+
<div class="vul-container d-flex flex-column pr-3 pl-3 pt-2 h-100">
2+
<div class="d-flex justify-content-between align-items-center mb-2 tab-header py-1">
33
<h5 class="card-title mb-0 text-uppercase label-header">
44
Users with Activity
55
</h5>

frontend/src/app/active-directory/active-directory.component.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
@import "../../assets/styles/var";
33
@import "../../assets/styles/custom-elements";
44

5+
:host {
6+
display: flex;
7+
flex-direction: column;
8+
flex: 1 1 auto;
9+
min-height: 0;
10+
height: 100%;
11+
}
12+
513
.vul-container {
614
.tab-header {
715
.nav {

frontend/src/app/active-directory/shared/components/active-directory-detail/active-directory-detail.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="container-fluid pl-2 pt-0 h-100">
1+
<div class="d-flex flex-column pl-2 pt-0 h-100">
22
<div *ngIf="!user"
33
class="no-object-selected d-flex flex-column align-items-center justify-content-center">
44
<app-no-data-found></app-no-data-found>

frontend/src/app/active-directory/shared/components/active-directory-detail/active-directory-detail.component.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
:host {
2+
display: flex;
3+
flex-direction: column;
4+
flex: 1 1 auto;
5+
min-height: 0;
6+
height: 100%;
7+
}
8+
19
.message-container {
210

311
}

frontend/src/app/active-directory/shared/components/active-directory-event/active-directory-event.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<div class="container-fluid p-0 h-100">
1+
<div class="d-flex flex-column p-0 h-100">
22
<div class="row h-100">
3-
<div class="col-lg-7 col-md-12 col-sm-12 pl-2 pr-0">
3+
<div class="d-flex h-100 m-h-0 col-lg-7 col-md-12 col-sm-12 pl-2 pr-0">
44
<app-event-timeline (eventChange)="onEventChange($event)"
55
[events]="[]"
66
[time]=""></app-event-timeline>

frontend/src/app/active-directory/shared/components/active-directory-event/active-directory-event.component.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
:host {
2+
display: flex;
3+
flex-direction: column;
4+
flex: 1 1 auto;
5+
min-height: 0;
6+
height: 100%;
7+
}
8+
9+
110
.message-container {
211
overflow-y: auto;
312
height: 70vh;

frontend/src/app/active-directory/shared/components/active-directory-event/active-directory-event.component.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import {Component, Input, OnInit} from '@angular/core';
2-
import {Event} from "../../../../shared/types/event/event";
2+
import {Event} from '../../../../shared/types/event/event';
33
import {TimeFilterType} from '../../../../shared/types/time-filter.type';
44
import {TreeObjectBehavior} from '../../behavior/tree-object.behvior';
5-
import {WinlogbeatEventType} from '../../types/winlogbeat-event.type';
65

76
@Component({
87
selector: 'app-active-directory-event',

frontend/src/app/active-directory/shared/components/event-timeline/event-timeline.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ <h6 class="card-title font-weight-light pb-0 text-blue-800">Events timeline</h6>
3636
<span class="text-blue-800 mt-2">No more events</span>
3737
</div>
3838
</div>
39-
<div *ngIf="items && items.length>0" class="mb-3 mt-1">
39+
<div *ngIf="items && items.length>0" class="my-3 mt-1">
4040
<div class="row justify-content-center">
4141
<ngb-pagination (pageChange)="loadPage($event)"
4242
[(page)]="page"
Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
1+
:host {
2+
display: flex;
3+
flex-direction: column;
4+
flex: 1 1 auto;
5+
min-height: 0;
6+
height: 100%;
7+
}
18

29
.event-timeline-container {
10+
display: flex;
11+
flex-direction: column;
12+
flex: 1 1 auto;
313
height: 100%;
4-
//max-height: 400px;
5-
//min-height: 400px;
14+
min-height: 0;
15+
overflow: hidden;
616
box-sizing: border-box;
7-
display: block;
8-
flex: none;
917
}
1018

1119
.main {
1220
width: 100%;
13-
height: 70vh;
14-
//max-height: 380px;
15-
min-height: 370px;
16-
box-sizing: border-box;
1721
overflow-y: scroll;
18-
position: relative;
1922
}

frontend/src/app/active-directory/view/active-directory-view/active-directory-view.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="d-flex active-directory-tree flex-nowrap">
1+
<div class="d-flex active-directory-tree flex-nowrap h-100 m-h-0 overflow-hidden pb-3">
22
<div [ngStyle]="{'width':treeWidth}"
33
mwlResizable
44
[enableGhostResize]="true"
@@ -37,7 +37,7 @@ <h6 class="text-blue-800 font-weight-light">{{object.name}}</h6>
3737
</ul>
3838
</div>
3939
</div>
40-
<div *ngIf="object" class="p-0 h-100">
40+
<div *ngIf="object" class="d-flex flex-column p-0 h-100">
4141
<app-active-directory-detail *ngIf="view==='detail'"
4242
[user]="object"
4343
[adInfo]="object">

0 commit comments

Comments
 (0)