diff --git a/ogWebconsole/src/app/app-routing.module.ts b/ogWebconsole/src/app/app-routing.module.ts index 74b564d..8c9c96c 100644 --- a/ogWebconsole/src/app/app-routing.module.ts +++ b/ogWebconsole/src/app/app-routing.module.ts @@ -13,6 +13,8 @@ import { ImagesComponent } from './components/ogboot/images/images.component'; import { PxeComponent } from './components/ogboot/pxe/pxe/pxe.component'; import { PxeBootFilesComponent } from './components/ogboot/pxe-boot-files/pxe-boot-files.component'; import {OgbootStatusComponent} from "./components/ogboot/ogboot-status/ogboot-status.component"; +import { OgdhcpComponent } from './components/ogdhcp/ogdhcp.component'; +import { OgDhcpSubnetsComponent } from './components/ogdhcp/og-dhcp-subnets/og-dhcp-subnets.component'; const routes: Routes = [ { path: '', redirectTo: 'auth/login', pathMatch: 'full' }, { @@ -28,6 +30,8 @@ const routes: Routes = [ { path: 'pxe', component: PxeComponent }, { path: 'pxe-boot-file', component: PxeBootFilesComponent }, { path: 'ogboot-status', component: OgbootStatusComponent }, + { path: 'dhcp', component: OgdhcpComponent }, + { path: 'dhcp-subnets', component: OgDhcpSubnetsComponent } ], }, { diff --git a/ogWebconsole/src/app/app.module.ts b/ogWebconsole/src/app/app.module.ts index d5f26e3..9331a86 100644 --- a/ogWebconsole/src/app/app.module.ts +++ b/ogWebconsole/src/app/app.module.ts @@ -86,7 +86,9 @@ import { CreatePxeBootFileComponent } from './components/ogboot/pxe-boot-files/c import { NgxChartsModule } from '@swimlane/ngx-charts'; import { DeleteImageComponent } from './components/ogboot/images/delete-image/delete-image/delete-image.component'; import { DeletePxeTemplateComponent } from './components/ogboot/pxe/pxe/delete-pxeTemplate/delete-pxe-template/delete-pxe-template.component'; -import { OgdhcpComponent } from './components/ogdhcp/ogdhcp/ogdhcp.component'; +import { OgdhcpComponent } from './components/ogdhcp/ogdhcp.component'; +import { OgDhcpSubnetsComponent } from './components/ogdhcp/og-dhcp-subnets/og-dhcp-subnets.component'; +import { CreateSubnetComponent } from './components/ogdhcp/og-dhcp-subnets/create-subnet/create-subnet/create-subnet.component'; @NgModule({ declarations: [ @@ -133,7 +135,9 @@ import { OgdhcpComponent } from './components/ogdhcp/ogdhcp/ogdhcp.component'; CreatePxeBootFileComponent, DeleteImageComponent, DeletePxeTemplateComponent, - OgdhcpComponent + OgdhcpComponent, + OgDhcpSubnetsComponent, + CreateSubnetComponent ], bootstrap: [AppComponent], imports: [BrowserModule, diff --git a/ogWebconsole/src/app/components/ogdhcp/ogdhcp/ogdhcp.component.css b/ogWebconsole/src/app/components/ogdhcp/ogdhcp/ogdhcp.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/ogWebconsole/src/app/components/ogdhcp/ogdhcp/ogdhcp.component.html b/ogWebconsole/src/app/components/ogdhcp/ogdhcp/ogdhcp.component.html deleted file mode 100644 index d680125..0000000 --- a/ogWebconsole/src/app/components/ogdhcp/ogdhcp/ogdhcp.component.html +++ /dev/null @@ -1 +0,0 @@ -

ogdhcp works!

diff --git a/ogWebconsole/src/app/components/ogdhcp/ogdhcp/ogdhcp.component.spec.ts b/ogWebconsole/src/app/components/ogdhcp/ogdhcp/ogdhcp.component.spec.ts deleted file mode 100644 index 0ab958d..0000000 --- a/ogWebconsole/src/app/components/ogdhcp/ogdhcp/ogdhcp.component.spec.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { OgdhcpComponent } from './ogdhcp.component'; - -describe('OgdhcpComponent', () => { - let component: OgdhcpComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [OgdhcpComponent] - }) - .compileComponents(); - - fixture = TestBed.createComponent(OgdhcpComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/ogWebconsole/src/app/components/ogdhcp/ogdhcp/ogdhcp.component.ts b/ogWebconsole/src/app/components/ogdhcp/ogdhcp/ogdhcp.component.ts deleted file mode 100644 index a8ee1b5..0000000 --- a/ogWebconsole/src/app/components/ogdhcp/ogdhcp/ogdhcp.component.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-ogdhcp', - templateUrl: './ogdhcp.component.html', - styleUrl: './ogdhcp.component.css' -}) -export class OgdhcpComponent { - -} diff --git a/ogWebconsole/src/app/layout/sidebar/sidebar.component.html b/ogWebconsole/src/app/layout/sidebar/sidebar.component.html index b9fc935..c644912 100644 --- a/ogWebconsole/src/app/layout/sidebar/sidebar.component.html +++ b/ogWebconsole/src/app/layout/sidebar/sidebar.component.html @@ -21,16 +21,15 @@ - - + desktop_windows ogBoot - - + + analytics @@ -56,6 +55,26 @@ + + + + + + settings_ethernet + ogDhcp + + + + + + + + lan + Subnets + + + + diff --git a/ogWebconsole/src/app/layout/sidebar/sidebar.component.ts b/ogWebconsole/src/app/layout/sidebar/sidebar.component.ts index 707ce98..d379b5f 100644 --- a/ogWebconsole/src/app/layout/sidebar/sidebar.component.ts +++ b/ogWebconsole/src/app/layout/sidebar/sidebar.component.ts @@ -13,11 +13,17 @@ export class SidebarComponent { isSuperAdmin: boolean = false; username: string = ""; decodedToken: any = ""; - showSubList: boolean = false; + showOgBootSub: boolean = false; + showOgDhcpSub: boolean = false; - toggleSubList() { - this.showSubList = !this.showSubList; + toggleOgBootSub() { + this.showOgBootSub = !this.showOgBootSub; } + toggleOgDhcpSub() { + this.showOgDhcpSub = !this.showOgDhcpSub; + } + + constructor(public dialog: MatDialog) {} ngOnInit(): void {