diff --git a/security-c4po-angular/src/app/objective-overview/index.ts b/security-c4po-angular/src/app/objective-overview/index.ts
new file mode 100644
index 0000000..4d4aa8a
--- /dev/null
+++ b/security-c4po-angular/src/app/objective-overview/index.ts
@@ -0,0 +1,2 @@
+export {ObjectiveOverviewModule} from './objective-overview.module';
+export {ObjectiveOverviewRoutingModule} from './objective-overview-routing.module';
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest-categories/pentest-categories.component.html b/security-c4po-angular/src/app/objective-overview/objective-categories/objective-categories.component.html
similarity index 100%
rename from security-c4po-angular/src/app/pentest-overview/pentest-categories/pentest-categories.component.html
rename to security-c4po-angular/src/app/objective-overview/objective-categories/objective-categories.component.html
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest-categories/pentest-categories.component.scss b/security-c4po-angular/src/app/objective-overview/objective-categories/objective-categories.component.scss
similarity index 100%
rename from security-c4po-angular/src/app/pentest-overview/pentest-categories/pentest-categories.component.scss
rename to security-c4po-angular/src/app/objective-overview/objective-categories/objective-categories.component.scss
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest-categories/pentest-categories.component.spec.ts b/security-c4po-angular/src/app/objective-overview/objective-categories/objective-categories.component.spec.ts
similarity index 82%
rename from security-c4po-angular/src/app/pentest-overview/pentest-categories/pentest-categories.component.spec.ts
rename to security-c4po-angular/src/app/objective-overview/objective-categories/objective-categories.component.spec.ts
index e7bbfbb..7aa9a99 100644
--- a/security-c4po-angular/src/app/pentest-overview/pentest-categories/pentest-categories.component.spec.ts
+++ b/security-c4po-angular/src/app/objective-overview/objective-categories/objective-categories.component.spec.ts
@@ -1,6 +1,6 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { PentestCategoriesComponent } from './pentest-categories.component';
+import { ObjectiveCategoriesComponent } from './objective-categories.component';
import {NbMenuModule, NbMenuService} from '@nebular/theme';
import {NgxsModule} from '@ngxs/store';
import {ProjectState} from '@shared/stores/project-state/project-state';
@@ -13,14 +13,14 @@ import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
import {ThemeModule} from '@assets/@theme/theme.module';
import {RouterTestingModule} from '@angular/router/testing';
-describe('PentestCategoriesComponent', () => {
- let component: PentestCategoriesComponent;
- let fixture: ComponentFixture
;
+describe('ObjectiveCategoriesComponent', () => {
+ let component: ObjectiveCategoriesComponent;
+ let fixture: ComponentFixture;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [
- PentestCategoriesComponent
+ ObjectiveCategoriesComponent
],
imports: [
CommonModule,
@@ -47,7 +47,7 @@ describe('PentestCategoriesComponent', () => {
});
beforeEach(() => {
- fixture = TestBed.createComponent(PentestCategoriesComponent);
+ fixture = TestBed.createComponent(ObjectiveCategoriesComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest-categories/pentest-categories.component.ts b/security-c4po-angular/src/app/objective-overview/objective-categories/objective-categories.component.ts
similarity index 90%
rename from security-c4po-angular/src/app/pentest-overview/pentest-categories/pentest-categories.component.ts
rename to security-c4po-angular/src/app/objective-overview/objective-categories/objective-categories.component.ts
index 5b917fe..2b5ef73 100644
--- a/security-c4po-angular/src/app/pentest-overview/pentest-categories/pentest-categories.component.ts
+++ b/security-c4po-angular/src/app/objective-overview/objective-categories/objective-categories.component.ts
@@ -8,11 +8,11 @@ import {untilDestroyed} from 'ngx-take-until-destroy';
import {TranslateService} from '@ngx-translate/core';
@Component({
- selector: 'app-pentest-categories',
- templateUrl: './pentest-categories.component.html',
- styleUrls: ['./pentest-categories.component.scss']
+ selector: 'app-objective-categories',
+ templateUrl: './objective-categories.component.html',
+ styleUrls: ['./objective-categories.component.scss']
})
-export class PentestCategoriesComponent implements OnInit, OnDestroy {
+export class ObjectiveCategoriesComponent implements OnInit, OnDestroy {
categories: NbMenuItem[] = [];
selectedCategory: Category = 0;
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest-header/pentest-header.component.html b/security-c4po-angular/src/app/objective-overview/objective-header/objective-header.component.html
similarity index 100%
rename from security-c4po-angular/src/app/pentest-overview/pentest-header/pentest-header.component.html
rename to security-c4po-angular/src/app/objective-overview/objective-header/objective-header.component.html
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest-header/pentest-header.component.scss b/security-c4po-angular/src/app/objective-overview/objective-header/objective-header.component.scss
similarity index 100%
rename from security-c4po-angular/src/app/pentest-overview/pentest-header/pentest-header.component.scss
rename to security-c4po-angular/src/app/objective-overview/objective-header/objective-header.component.scss
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest-header/pentest-header.component.spec.ts b/security-c4po-angular/src/app/objective-overview/objective-header/objective-header.component.spec.ts
similarity index 82%
rename from security-c4po-angular/src/app/pentest-overview/pentest-header/pentest-header.component.spec.ts
rename to security-c4po-angular/src/app/objective-overview/objective-header/objective-header.component.spec.ts
index 864327e..f7218e7 100644
--- a/security-c4po-angular/src/app/pentest-overview/pentest-header/pentest-header.component.spec.ts
+++ b/security-c4po-angular/src/app/objective-overview/objective-header/objective-header.component.spec.ts
@@ -1,6 +1,6 @@
import {ComponentFixture, TestBed} from '@angular/core/testing';
-import {PentestHeaderComponent} from './pentest-header.component';
+import {ObjectiveHeaderComponent} from './objective-header.component';
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
import {HttpClientTestingModule} from '@angular/common/http/testing';
import {ThemeModule} from '@assets/@theme/theme.module';
@@ -13,13 +13,13 @@ import {ProjectState} from '@shared/stores/project-state/project-state';
import {FontAwesomeModule} from '@fortawesome/angular-fontawesome';
import {NbActionsModule, NbIconModule} from '@nebular/theme';
-describe('PentestHeaderComponent', () => {
- let component: PentestHeaderComponent;
- let fixture: ComponentFixture;
+describe('ObjectiveHeaderComponent', () => {
+ let component: ObjectiveHeaderComponent;
+ let fixture: ComponentFixture;
beforeEach(async () => {
await TestBed.configureTestingModule({
- declarations: [PentestHeaderComponent],
+ declarations: [ObjectiveHeaderComponent],
imports: [
BrowserAnimationsModule,
HttpClientTestingModule,
@@ -42,7 +42,7 @@ describe('PentestHeaderComponent', () => {
});
beforeEach(() => {
- fixture = TestBed.createComponent(PentestHeaderComponent);
+ fixture = TestBed.createComponent(ObjectiveHeaderComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest-header/pentest-header.component.ts b/security-c4po-angular/src/app/objective-overview/objective-header/objective-header.component.ts
similarity index 87%
rename from security-c4po-angular/src/app/pentest-overview/pentest-header/pentest-header.component.ts
rename to security-c4po-angular/src/app/objective-overview/objective-header/objective-header.component.ts
index ad40a17..05da59a 100644
--- a/security-c4po-angular/src/app/pentest-overview/pentest-header/pentest-header.component.ts
+++ b/security-c4po-angular/src/app/objective-overview/objective-header/objective-header.component.ts
@@ -10,11 +10,11 @@ import {Project} from '@shared/models/project.model';
@UntilDestroy()
@Component({
- selector: 'app-pentest-header',
- templateUrl: './pentest-header.component.html',
- styleUrls: ['./pentest-header.component.scss']
+ selector: 'app-objective-header',
+ templateUrl: './objective-header.component.html',
+ styleUrls: ['./objective-header.component.scss']
})
-export class PentestHeaderComponent implements OnInit {
+export class ObjectiveHeaderComponent implements OnInit {
readonly fa = FA;
selectedProjectTitle$: BehaviorSubject = new BehaviorSubject('');
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest-overview-routing.module.ts b/security-c4po-angular/src/app/objective-overview/objective-overview-routing.module.ts
similarity index 82%
rename from security-c4po-angular/src/app/pentest-overview/pentest-overview-routing.module.ts
rename to security-c4po-angular/src/app/objective-overview/objective-overview-routing.module.ts
index 1213273..499a313 100644
--- a/security-c4po-angular/src/app/pentest-overview/pentest-overview-routing.module.ts
+++ b/security-c4po-angular/src/app/objective-overview/objective-overview-routing.module.ts
@@ -8,5 +8,5 @@ const routes: Routes = [
imports: [RouterModule.forChild(routes)],
exports: [RouterModule]
})
-export class PentestOverviewRoutingModule {
+export class ObjectiveOverviewRoutingModule {
}
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest-overview.module.ts b/security-c4po-angular/src/app/objective-overview/objective-overview.module.ts
similarity index 73%
rename from security-c4po-angular/src/app/pentest-overview/pentest-overview.module.ts
rename to security-c4po-angular/src/app/objective-overview/objective-overview.module.ts
index a8a857c..ac04767 100644
--- a/security-c4po-angular/src/app/pentest-overview/pentest-overview.module.ts
+++ b/security-c4po-angular/src/app/objective-overview/objective-overview.module.ts
@@ -1,8 +1,8 @@
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
-import {PentestHeaderComponent} from './pentest-header/pentest-header.component';
-import {PentestCategoriesComponent} from './pentest-categories/pentest-categories.component';
-import {PentestTableComponent} from './pentest-table/pentest-table.component';
+import {ObjectiveHeaderComponent} from './objective-header/objective-header.component';
+import {ObjectiveCategoriesComponent} from './objective-categories/objective-categories.component';
+import {ObjectiveTableComponent} from './objective-table/objective-table.component';
import {
NbCardModule,
NbLayoutModule,
@@ -24,9 +24,9 @@ import {LoadingSpinnerComponent} from '@shared/widgets/loading-spinner/loading-s
@NgModule({
declarations: [
- PentestHeaderComponent,
- PentestCategoriesComponent,
- PentestTableComponent,
+ ObjectiveHeaderComponent,
+ ObjectiveCategoriesComponent,
+ ObjectiveTableComponent,
// LoadingSpinnerComponent
],
imports: [
@@ -51,11 +51,11 @@ import {LoadingSpinnerComponent} from '@shared/widgets/loading-spinner/loading-s
NbActionsModule
],
exports: [
- PentestHeaderComponent,
- PentestCategoriesComponent,
- PentestTableComponent,
+ ObjectiveHeaderComponent,
+ ObjectiveCategoriesComponent,
+ ObjectiveTableComponent,
// LoadingSpinnerComponent
]
})
-export class PentestOverviewModule {
+export class ObjectiveOverviewModule {
}
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest-table/pentest-table.component.html b/security-c4po-angular/src/app/objective-overview/objective-table/objective-table.component.html
similarity index 100%
rename from security-c4po-angular/src/app/pentest-overview/pentest-table/pentest-table.component.html
rename to security-c4po-angular/src/app/objective-overview/objective-table/objective-table.component.html
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest-table/pentest-table.component.scss b/security-c4po-angular/src/app/objective-overview/objective-table/objective-table.component.scss
similarity index 100%
rename from security-c4po-angular/src/app/pentest-overview/pentest-table/pentest-table.component.scss
rename to security-c4po-angular/src/app/objective-overview/objective-table/objective-table.component.scss
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest-table/pentest-table.component.spec.ts b/security-c4po-angular/src/app/objective-overview/objective-table/objective-table.component.spec.ts
similarity index 85%
rename from security-c4po-angular/src/app/pentest-overview/pentest-table/pentest-table.component.spec.ts
rename to security-c4po-angular/src/app/objective-overview/objective-table/objective-table.component.spec.ts
index 9b315b3..35840f1 100644
--- a/security-c4po-angular/src/app/pentest-overview/pentest-table/pentest-table.component.spec.ts
+++ b/security-c4po-angular/src/app/objective-overview/objective-table/objective-table.component.spec.ts
@@ -1,6 +1,6 @@
import {ComponentFixture, TestBed} from '@angular/core/testing';
-import {PentestTableComponent} from './pentest-table.component';
+import {ObjectiveTableComponent} from './objective-table.component';
import {NbCardModule, NbTreeGridModule} from '@nebular/theme';
import {TranslateLoader, TranslateModule} from '@ngx-translate/core';
import {HttpLoaderFactory} from '../../common-app.module';
@@ -15,14 +15,14 @@ import {NgxsModule} from '@ngxs/store';
import {ProjectState} from '@shared/stores/project-state/project-state';
import {HttpClientTestingModule} from '@angular/common/http/testing';
-describe('PentestTableComponent', () => {
- let component: PentestTableComponent;
- let fixture: ComponentFixture;
+describe('ObjectiveTableComponent', () => {
+ let component: ObjectiveTableComponent;
+ let fixture: ComponentFixture;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [
- PentestTableComponent,
+ ObjectiveTableComponent,
MockComponent(StatusTagComponent),
MockComponent(FindigWidgetComponent)
],
@@ -47,7 +47,7 @@ describe('PentestTableComponent', () => {
});
beforeEach(() => {
- fixture = TestBed.createComponent(PentestTableComponent);
+ fixture = TestBed.createComponent(ObjectiveTableComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest-table/pentest-table.component.ts b/security-c4po-angular/src/app/objective-overview/objective-table/objective-table.component.ts
similarity index 94%
rename from security-c4po-angular/src/app/pentest-overview/pentest-table/pentest-table.component.ts
rename to security-c4po-angular/src/app/objective-overview/objective-table/objective-table.component.ts
index 15eb14c..46b871d 100644
--- a/security-c4po-angular/src/app/pentest-overview/pentest-table/pentest-table.component.ts
+++ b/security-c4po-angular/src/app/objective-overview/objective-table/objective-table.component.ts
@@ -14,11 +14,11 @@ import {ChangePentest} from '@shared/stores/project-state/project-state.actions'
@UntilDestroy()
@Component({
- selector: 'app-pentest-table',
- templateUrl: './pentest-table.component.html',
- styleUrls: ['./pentest-table.component.scss']
+ selector: 'app-objective-table',
+ templateUrl: './objective-table.component.html',
+ styleUrls: ['./objective-table.component.scss']
})
-export class PentestTableComponent implements OnInit {
+export class ObjectiveTableComponent implements OnInit {
loading$: BehaviorSubject = new BehaviorSubject(true);
columns: Array = [PentestColumns.TEST_ID, PentestColumns.TITLE, PentestColumns.STATUS, PentestColumns.FINDINGS];
diff --git a/security-c4po-angular/src/app/pentest-overview/index.ts b/security-c4po-angular/src/app/pentest-overview/index.ts
deleted file mode 100644
index debc9bd..0000000
--- a/security-c4po-angular/src/app/pentest-overview/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export {PentestOverviewModule} from './pentest-overview.module';
-export {PentestOverviewRoutingModule} from './pentest-overview-routing.module';
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest/index.ts b/security-c4po-angular/src/app/pentest/index.ts
similarity index 100%
rename from security-c4po-angular/src/app/pentest-overview/pentest/index.ts
rename to security-c4po-angular/src/app/pentest/index.ts
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-comments/pentest-comments.component.html b/security-c4po-angular/src/app/pentest/pentest-content/pentest-comments/pentest-comments.component.html
similarity index 100%
rename from security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-comments/pentest-comments.component.html
rename to security-c4po-angular/src/app/pentest/pentest-content/pentest-comments/pentest-comments.component.html
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-comments/pentest-comments.component.scss b/security-c4po-angular/src/app/pentest/pentest-content/pentest-comments/pentest-comments.component.scss
similarity index 100%
rename from security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-comments/pentest-comments.component.scss
rename to security-c4po-angular/src/app/pentest/pentest-content/pentest-comments/pentest-comments.component.scss
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-comments/pentest-comments.component.spec.ts b/security-c4po-angular/src/app/pentest/pentest-content/pentest-comments/pentest-comments.component.spec.ts
similarity index 100%
rename from security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-comments/pentest-comments.component.spec.ts
rename to security-c4po-angular/src/app/pentest/pentest-content/pentest-comments/pentest-comments.component.spec.ts
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-comments/pentest-comments.component.ts b/security-c4po-angular/src/app/pentest/pentest-content/pentest-comments/pentest-comments.component.ts
similarity index 100%
rename from security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-comments/pentest-comments.component.ts
rename to security-c4po-angular/src/app/pentest/pentest-content/pentest-comments/pentest-comments.component.ts
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-content.component.html b/security-c4po-angular/src/app/pentest/pentest-content/pentest-content.component.html
similarity index 100%
rename from security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-content.component.html
rename to security-c4po-angular/src/app/pentest/pentest-content/pentest-content.component.html
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-content.component.scss b/security-c4po-angular/src/app/pentest/pentest-content/pentest-content.component.scss
similarity index 100%
rename from security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-content.component.scss
rename to security-c4po-angular/src/app/pentest/pentest-content/pentest-content.component.scss
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-content.component.spec.ts b/security-c4po-angular/src/app/pentest/pentest-content/pentest-content.component.spec.ts
similarity index 97%
rename from security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-content.component.spec.ts
rename to security-c4po-angular/src/app/pentest/pentest-content/pentest-content.component.spec.ts
index 3115c6c..99335e7 100644
--- a/security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-content.component.spec.ts
+++ b/security-c4po-angular/src/app/pentest/pentest-content/pentest-content.component.spec.ts
@@ -2,7 +2,7 @@ import {ComponentFixture, TestBed} from '@angular/core/testing';
import {PentestContentComponent} from './pentest-content.component';
import {TranslateLoader, TranslateModule} from '@ngx-translate/core';
-import {HttpLoaderFactory} from '../../../common-app.module';
+import {HttpLoaderFactory} from '../../common-app.module';
import {HttpClient} from '@angular/common/http';
import {RouterTestingModule} from '@angular/router/testing';
import {NgxsModule, Store} from '@ngxs/store';
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-content.component.ts b/security-c4po-angular/src/app/pentest/pentest-content/pentest-content.component.ts
similarity index 100%
rename from security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-content.component.ts
rename to security-c4po-angular/src/app/pentest/pentest-content/pentest-content.component.ts
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-findings/pentest-findings.component.html b/security-c4po-angular/src/app/pentest/pentest-content/pentest-findings/pentest-findings.component.html
similarity index 100%
rename from security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-findings/pentest-findings.component.html
rename to security-c4po-angular/src/app/pentest/pentest-content/pentest-findings/pentest-findings.component.html
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-findings/pentest-findings.component.scss b/security-c4po-angular/src/app/pentest/pentest-content/pentest-findings/pentest-findings.component.scss
similarity index 100%
rename from security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-findings/pentest-findings.component.scss
rename to security-c4po-angular/src/app/pentest/pentest-content/pentest-findings/pentest-findings.component.scss
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-findings/pentest-findings.component.spec.ts b/security-c4po-angular/src/app/pentest/pentest-content/pentest-findings/pentest-findings.component.spec.ts
similarity index 100%
rename from security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-findings/pentest-findings.component.spec.ts
rename to security-c4po-angular/src/app/pentest/pentest-content/pentest-findings/pentest-findings.component.spec.ts
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-findings/pentest-findings.component.ts b/security-c4po-angular/src/app/pentest/pentest-content/pentest-findings/pentest-findings.component.ts
similarity index 100%
rename from security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-findings/pentest-findings.component.ts
rename to security-c4po-angular/src/app/pentest/pentest-content/pentest-findings/pentest-findings.component.ts
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-info/pentest-info.component.html b/security-c4po-angular/src/app/pentest/pentest-content/pentest-info/pentest-info.component.html
similarity index 100%
rename from security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-info/pentest-info.component.html
rename to security-c4po-angular/src/app/pentest/pentest-content/pentest-info/pentest-info.component.html
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-info/pentest-info.component.scss b/security-c4po-angular/src/app/pentest/pentest-content/pentest-info/pentest-info.component.scss
similarity index 100%
rename from security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-info/pentest-info.component.scss
rename to security-c4po-angular/src/app/pentest/pentest-content/pentest-info/pentest-info.component.scss
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-info/pentest-info.component.spec.ts b/security-c4po-angular/src/app/pentest/pentest-content/pentest-info/pentest-info.component.spec.ts
similarity index 100%
rename from security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-info/pentest-info.component.spec.ts
rename to security-c4po-angular/src/app/pentest/pentest-content/pentest-info/pentest-info.component.spec.ts
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-info/pentest-info.component.ts b/security-c4po-angular/src/app/pentest/pentest-content/pentest-info/pentest-info.component.ts
similarity index 100%
rename from security-c4po-angular/src/app/pentest-overview/pentest/pentest-content/pentest-info/pentest-info.component.ts
rename to security-c4po-angular/src/app/pentest/pentest-content/pentest-info/pentest-info.component.ts
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest/pentest-menu/pentest-menu.component.html b/security-c4po-angular/src/app/pentest/pentest-header/pentest-header.component.html
similarity index 100%
rename from security-c4po-angular/src/app/pentest-overview/pentest/pentest-menu/pentest-menu.component.html
rename to security-c4po-angular/src/app/pentest/pentest-header/pentest-header.component.html
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest/pentest-menu/pentest-menu.component.scss b/security-c4po-angular/src/app/pentest/pentest-header/pentest-header.component.scss
similarity index 100%
rename from security-c4po-angular/src/app/pentest-overview/pentest/pentest-menu/pentest-menu.component.scss
rename to security-c4po-angular/src/app/pentest/pentest-header/pentest-header.component.scss
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest/pentest-menu/pentest-menu.component.spec.ts b/security-c4po-angular/src/app/pentest/pentest-header/pentest-header.component.spec.ts
similarity index 85%
rename from security-c4po-angular/src/app/pentest-overview/pentest/pentest-menu/pentest-menu.component.spec.ts
rename to security-c4po-angular/src/app/pentest/pentest-header/pentest-header.component.spec.ts
index 2afe1c7..b83dad9 100644
--- a/security-c4po-angular/src/app/pentest-overview/pentest/pentest-menu/pentest-menu.component.spec.ts
+++ b/security-c4po-angular/src/app/pentest/pentest-header/pentest-header.component.spec.ts
@@ -1,10 +1,10 @@
import {ComponentFixture, TestBed} from '@angular/core/testing';
-import {PentestMenuComponent} from './pentest-menu.component';
+import {PentestHeaderComponent} from './pentest-header.component';
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
import {HttpClientTestingModule} from '@angular/common/http/testing';
import {TranslateLoader, TranslateModule} from '@ngx-translate/core';
-import {HttpLoaderFactory} from '../../../common-app.module';
+import {HttpLoaderFactory} from '../../common-app.module';
import {HttpClient} from '@angular/common/http';
import {RouterTestingModule} from '@angular/router/testing';
import {NgxsModule, Store} from '@ngxs/store';
@@ -38,14 +38,14 @@ const DESIRED_PROJECT_STATE_SESSION: ProjectStateModel = {
},
};
-describe('PentestMenuComponent', () => {
- let component: PentestMenuComponent;
- let fixture: ComponentFixture;
+describe('PentestHeaderComponent', () => {
+ let component: PentestHeaderComponent;
+ let fixture: ComponentFixture;
let store: Store;
beforeEach(async () => {
await TestBed.configureTestingModule({
- declarations: [PentestMenuComponent],
+ declarations: [PentestHeaderComponent],
imports: [
BrowserAnimationsModule,
HttpClientTestingModule,
@@ -64,7 +64,7 @@ describe('PentestMenuComponent', () => {
});
beforeEach(() => {
- fixture = TestBed.createComponent(PentestMenuComponent);
+ fixture = TestBed.createComponent(PentestHeaderComponent);
store = TestBed.inject(Store);
store.reset({
...store.snapshot(),
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest/pentest-menu/pentest-menu.component.ts b/security-c4po-angular/src/app/pentest/pentest-header/pentest-header.component.ts
similarity index 90%
rename from security-c4po-angular/src/app/pentest-overview/pentest/pentest-menu/pentest-menu.component.ts
rename to security-c4po-angular/src/app/pentest/pentest-header/pentest-header.component.ts
index de5224d..ff7ad23 100644
--- a/security-c4po-angular/src/app/pentest-overview/pentest/pentest-menu/pentest-menu.component.ts
+++ b/security-c4po-angular/src/app/pentest/pentest-header/pentest-header.component.ts
@@ -13,11 +13,11 @@ import {Pentest} from '@shared/models/pentest.model';
@UntilDestroy()
@Component({
- selector: 'app-pentest-menu',
- templateUrl: './pentest-menu.component.html',
- styleUrls: ['./pentest-menu.component.scss']
+ selector: 'app-pentest-header',
+ templateUrl: './pentest-header.component.html',
+ styleUrls: ['./pentest-header.component.scss']
})
-export class PentestMenuComponent implements OnInit {
+export class PentestHeaderComponent implements OnInit {
// HTML only
readonly fa = FA;
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest/pentest-routing.module.ts b/security-c4po-angular/src/app/pentest/pentest-routing.module.ts
similarity index 100%
rename from security-c4po-angular/src/app/pentest-overview/pentest/pentest-routing.module.ts
rename to security-c4po-angular/src/app/pentest/pentest-routing.module.ts
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest/pentest.component.html b/security-c4po-angular/src/app/pentest/pentest.component.html
similarity index 89%
rename from security-c4po-angular/src/app/pentest-overview/pentest/pentest.component.html
rename to security-c4po-angular/src/app/pentest/pentest.component.html
index e475fcc..4a36d9d 100644
--- a/security-c4po-angular/src/app/pentest-overview/pentest/pentest.component.html
+++ b/security-c4po-angular/src/app/pentest/pentest.component.html
@@ -1,7 +1,7 @@
-
+
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest/pentest.component.scss b/security-c4po-angular/src/app/pentest/pentest.component.scss
similarity index 79%
rename from security-c4po-angular/src/app/pentest-overview/pentest/pentest.component.scss
rename to security-c4po-angular/src/app/pentest/pentest.component.scss
index 2552390..fa0eaaf 100644
--- a/security-c4po-angular/src/app/pentest-overview/pentest/pentest.component.scss
+++ b/security-c4po-angular/src/app/pentest/pentest.component.scss
@@ -1,5 +1,5 @@
-@import '../../../assets/@theme/styles/themes';
-@import '../../../assets/@theme/styles/_variables.scss';
+@import '../../assets/@theme/styles/themes';
+@import '../../assets/@theme/styles/variables';
.pentest {
width: 100vw;
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest/pentest.component.spec.ts b/security-c4po-angular/src/app/pentest/pentest.component.spec.ts
similarity index 100%
rename from security-c4po-angular/src/app/pentest-overview/pentest/pentest.component.spec.ts
rename to security-c4po-angular/src/app/pentest/pentest.component.spec.ts
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest/pentest.component.ts b/security-c4po-angular/src/app/pentest/pentest.component.ts
similarity index 100%
rename from security-c4po-angular/src/app/pentest-overview/pentest/pentest.component.ts
rename to security-c4po-angular/src/app/pentest/pentest.component.ts
diff --git a/security-c4po-angular/src/app/pentest-overview/pentest/pentest.module.ts b/security-c4po-angular/src/app/pentest/pentest.module.ts
similarity index 92%
rename from security-c4po-angular/src/app/pentest-overview/pentest/pentest.module.ts
rename to security-c4po-angular/src/app/pentest/pentest.module.ts
index a13e4fa..ece5f5e 100644
--- a/security-c4po-angular/src/app/pentest-overview/pentest/pentest.module.ts
+++ b/security-c4po-angular/src/app/pentest/pentest.module.ts
@@ -3,7 +3,7 @@ import {CommonModule} from '@angular/common';
import {RouterModule} from '@angular/router';
import {PentestComponent} from './pentest.component';
import {NbButtonModule, NbCardModule, NbLayoutModule, NbTabsetModule} from '@nebular/theme';
-import { PentestMenuComponent } from './pentest-menu/pentest-menu.component';
+import { PentestHeaderComponent } from './pentest-header/pentest-header.component';
import { PentestContentComponent } from './pentest-content/pentest-content.component';
import {FlexLayoutModule} from '@angular/flex-layout';
import {FontAwesomeModule} from '@fortawesome/angular-fontawesome';
@@ -16,7 +16,7 @@ import { PentestCommentsComponent } from './pentest-content/pentest-comments/pen
@NgModule({
declarations: [
PentestComponent,
- PentestMenuComponent,
+ PentestHeaderComponent,
PentestContentComponent,
PentestInfoComponent,
PentestFindingsComponent,
diff --git a/security-c4po-angular/src/app/project-overview/project/project-routing.module.ts b/security-c4po-angular/src/app/project-overview/project/project-routing.module.ts
index 2a55100..820ac2c 100644
--- a/security-c4po-angular/src/app/project-overview/project/project-routing.module.ts
+++ b/security-c4po-angular/src/app/project-overview/project/project-routing.module.ts
@@ -9,7 +9,7 @@ const routes: Routes = [
},
{
path: 'pentest',
- loadChildren: () => import('../../pentest-overview/pentest').then(mod => mod.PentestModule),
+ loadChildren: () => import('../../pentest').then(mod => mod.PentestModule),
},
];
diff --git a/security-c4po-angular/src/app/project-overview/project/project.component.html b/security-c4po-angular/src/app/project-overview/project/project.component.html
index 36b0da1..c36a079 100644
--- a/security-c4po-angular/src/app/project-overview/project/project.component.html
+++ b/security-c4po-angular/src/app/project-overview/project/project.component.html
@@ -2,19 +2,19 @@
-
+
-
+
-
+
diff --git a/security-c4po-angular/src/app/project-overview/project/project.component.spec.ts b/security-c4po-angular/src/app/project-overview/project/project.component.spec.ts
index 62601d6..ae5537d 100644
--- a/security-c4po-angular/src/app/project-overview/project/project.component.spec.ts
+++ b/security-c4po-angular/src/app/project-overview/project/project.component.spec.ts
@@ -12,7 +12,7 @@ import {SessionState} from '@shared/stores/session-state/session-state';
import {HttpClientTestingModule} from '@angular/common/http/testing';
import {NbCardModule, NbLayoutModule} from '@nebular/theme';
import {KeycloakService} from 'keycloak-angular';
-import {PentestOverviewModule} from '../../pentest-overview';
+import {ObjectiveOverviewModule} from '../../objective-overview';
describe('ProjectComponent', () => {
let component: ProjectComponent;
@@ -27,7 +27,7 @@ describe('ProjectComponent', () => {
CommonModule,
NbLayoutModule,
NbCardModule,
- PentestOverviewModule,
+ ObjectiveOverviewModule,
ThemeModule.forRoot(),
TranslateModule.forRoot({
loader: {
diff --git a/security-c4po-angular/src/app/project-overview/project/project.module.ts b/security-c4po-angular/src/app/project-overview/project/project.module.ts
index bc989a4..f73da80 100644
--- a/security-c4po-angular/src/app/project-overview/project/project.module.ts
+++ b/security-c4po-angular/src/app/project-overview/project/project.module.ts
@@ -7,7 +7,7 @@ import {FlexLayoutModule} from '@angular/flex-layout';
import {TranslateModule} from '@ngx-translate/core';
import {ProjectDialogModule} from '@shared/modules/project-dialog/project-dialog.module';
import {ProjectRoutingModule} from './project-routing.module';
-import {PentestOverviewModule} from '../../pentest-overview';
+import {ObjectiveOverviewModule} from '../../objective-overview';
@NgModule({
declarations: [
@@ -25,7 +25,7 @@ import {PentestOverviewModule} from '../../pentest-overview';
TranslateModule,
FlexLayoutModule,
ProjectDialogModule,
- PentestOverviewModule
+ ObjectiveOverviewModule
],
exports: [
ProjectComponent
diff --git a/security-c4po-angular/src/assets/images/favicons/corporate_favicon.ico b/security-c4po-angular/src/assets/images/favicons/corporate_favicon.ico
deleted file mode 100644
index a2309ee..0000000
Binary files a/security-c4po-angular/src/assets/images/favicons/corporate_favicon.ico and /dev/null differ
diff --git a/security-c4po-angular/src/assets/images/favicons/favicon.ico b/security-c4po-angular/src/assets/images/favicons/favicon.ico
index 7221d73..c2a7992 100644
Binary files a/security-c4po-angular/src/assets/images/favicons/favicon.ico and b/security-c4po-angular/src/assets/images/favicons/favicon.ico differ
diff --git a/security-c4po-angular/src/assets/images/favicons/favicon_corporate.ico b/security-c4po-angular/src/assets/images/favicons/favicon_corporate.ico
new file mode 100644
index 0000000..315f719
Binary files /dev/null and b/security-c4po-angular/src/assets/images/favicons/favicon_corporate.ico differ
diff --git a/security-c4po-angular/src/index.html b/security-c4po-angular/src/index.html
index 690c807..b7d681f 100644
--- a/security-c4po-angular/src/index.html
+++ b/security-c4po-angular/src/index.html
@@ -5,7 +5,7 @@
Security C4PO
-
+
diff --git a/wiki/C4PO-Roadmap.png b/wiki/C4PO-Roadmap.png
index 0ff4fb8..011f081 100644
Binary files a/wiki/C4PO-Roadmap.png and b/wiki/C4PO-Roadmap.png differ
diff --git a/wiki/repository-open-graph-c4po.png b/wiki/repository-open-graph-c4po.png
new file mode 100644
index 0000000..272277c
Binary files /dev/null and b/wiki/repository-open-graph-c4po.png differ
+ 
