Folders new structure

ogWebconsole/src/app/app-routing.module.ts

@@ -1,18 +1,18 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { MainLayoutComponent } from './components/layout/main-layout/main-layout.component';
-import { AuthLayoutComponent } from './components/layout/auth-layout/auth-layout.component';
+import { MainLayoutComponent } from './layout/main-layout/main-layout.component';
+import { AuthLayoutComponent } from './layout/auth-layout/auth-layout.component';
 import { LoginComponent } from './components/login/login.component';
 import { DashboardComponent } from './components/dashboard/dashboard.component';
-import { PageNotFoundComponent } from './components/page-not-found/page-not-found.component';
-import { AdminComponent } from './components/pages/admin/admin.component';
-import { UsersComponent } from './components/pages/admin/users/users/users.component';
-import { RolesComponent } from './components/pages/admin/roles/roles/roles.component';
+import { PageNotFoundComponent } from './shared/page-not-found/page-not-found.component';
+import { AdminComponent } from './components/admin/admin.component';
+import { UsersComponent } from './components/admin/users/users/users.component';
+import { RolesComponent } from './components/admin/roles/roles/roles.component';
 import { GroupsComponent } from './components/groups/groups.component';
-import { ImagesComponent } from './components/images/images/images.component';
-import { PxeComponent } from './components/pxe/pxe/pxe.component';
-import {PxeBootFilesComponent} from "./components/pxe-boot-files/pxe-boot-files.component";
-import {OgbootStatusComponent} from "./components/ogboot-status/ogboot-status.component";
+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";
 const routes: Routes = [
   { path: '', redirectTo: 'auth/login', pathMatch: 'full' },
 {

ogWebconsole/src/app/app.module.ts

@@ -4,37 +4,37 @@ import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
-import { AuthLayoutComponent } from './components/layout/auth-layout/auth-layout.component';
-import { MainLayoutComponent } from './components/layout/main-layout/main-layout.component';
-import { HeaderComponent } from './components/layout/header/header.component';
-import { SidebarComponent } from './components/layout/sidebar/sidebar.component';
+import { AuthLayoutComponent } from './layout/auth-layout/auth-layout.component';
+import { MainLayoutComponent } from './layout/main-layout/main-layout.component';
+import { HeaderComponent } from './layout/header/header.component';
+import { SidebarComponent } from './layout/sidebar/sidebar.component';
 import { LoginComponent } from './components/login/login.component';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
-import { CustomInterceptor } from './services/custom.interceptor';
+import { CustomInterceptor } from './core/services/custom.interceptor';
 import { provideAnimationsAsync } from '@angular/platform-browser/animations/async';
 import { MatToolbarModule } from '@angular/material/toolbar';
 import { MatIconModule } from '@angular/material/icon';
 import { MatButtonModule } from '@angular/material/button';
 import { MatSidenavModule } from '@angular/material/sidenav';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { AdminComponent } from './components/pages/admin/admin.component';
+import { AdminComponent } from './components/admin/admin.component';
 import { MatCardModule } from '@angular/material/card';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatInputModule } from '@angular/material/input';
 import { MatListModule } from '@angular/material/list';
-import { UsersComponent } from './components/pages/admin/users/users/users.component';
-import { RolesComponent } from './components/pages/admin/roles/roles/roles.component';
+import { UsersComponent } from './components/admin/users/users/users.component';
+import { RolesComponent } from './components/admin/roles/roles/roles.component';
 import { MatTableModule } from '@angular/material/table';
 import { MatDialogModule } from '@angular/material/dialog';
-import { DeleteUserModalComponent } from './components/pages/admin/users/users/delete-user-modal/delete-user-modal.component';
-import { AddUserModalComponent } from './components/pages/admin/users/users/add-user-modal/add-user-modal.component';
+import { DeleteUserModalComponent } from './components/admin/users/users/delete-user-modal/delete-user-modal.component';
+import { AddUserModalComponent } from './components/admin/users/users/add-user-modal/add-user-modal.component';
 import { MatSelectModule } from '@angular/material/select';
-import { EditUserModalComponent } from './components/pages/admin/users/users/edit-user-modal/edit-user-modal.component';
-import { AddRoleModalComponent } from './components/pages/admin/roles/roles/add-role-modal/add-role-modal.component';
-import { DeleteRoleModalComponent } from './components/pages/admin/roles/roles/delete-role-modal/delete-role-modal.component';
-import { ChangePasswordModalComponent } from './components/pages/admin/users/users/change-password-modal/change-password-modal.component';
+import { EditUserModalComponent } from './components/admin/users/users/edit-user-modal/edit-user-modal.component';
+import { AddRoleModalComponent } from './components/admin/roles/roles/add-role-modal/add-role-modal.component';
+import { DeleteRoleModalComponent } from './components/admin/roles/roles/delete-role-modal/delete-role-modal.component';
+import { ChangePasswordModalComponent } from './components/admin/users/users/change-password-modal/change-password-modal.component';
 import { GroupsComponent } from './components/groups/groups.component';
 import { MatDividerModule } from '@angular/material/divider';
 import { CreateOrganizationalUnitComponent } from './components/groups/organizational-units/create-organizational-unit/create-organizational-unit.component';
@@ -72,20 +72,21 @@ import { ClassroomViewDialogComponent } from './components/groups/classroom-view
 import {MatPaginator} from "@angular/material/paginator";
 import { SaveFiltersDialogComponent } from './components/groups/save-filters-dialog/save-filters-dialog.component';
 import { AcctionsModalComponent } from './components/groups/acctions-modal/acctions-modal.component';
-import { ImagesComponent } from './components/images/images/images.component';
-import { CreateImageComponent } from './components/images/images/create-image/create-image/create-image.component';
-import { EditImageComponent } from './components/images/images/edit-image/edit-image/edit-image.component';
-import { InfoImageComponent } from './components/images/images/info-image/info-image/info-image.component';
-import { PxeComponent } from './components/pxe/pxe/pxe.component';
-import { CreatePxeTemplateComponent } from './components/pxe/pxe/create-pxeTemplate/create-pxe-template/create-pxe-template.component';
-import { EditPxeTemplateComponent } from './components/pxe/pxe/edit-pxe-template/edit-pxe-template.component';
-import { PxeBootFilesComponent } from './components/pxe-boot-files/pxe-boot-files.component';
+import { ImagesComponent } from './components/ogboot/images/images.component';
+import { CreateImageComponent } from './components/ogboot/images/create-image/create-image/create-image.component';
+import { EditImageComponent } from './components/ogboot/images/edit-image/edit-image/edit-image.component';
+import { InfoImageComponent } from './components/ogboot/images/info-image/info-image/info-image.component';
+import { PxeComponent } from './components/ogboot/pxe/pxe/pxe.component';
+import { CreatePxeTemplateComponent } from './components/ogboot/pxe/pxe/create-pxeTemplate/create-pxe-template/create-pxe-template.component';
+import { EditPxeTemplateComponent } from './components/ogboot/pxe/pxe/edit-pxe-template/edit-pxe-template.component';
+import { PxeBootFilesComponent } from './components/ogboot/pxe-boot-files/pxe-boot-files.component';
 import {MatExpansionPanel, MatExpansionPanelDescription, MatExpansionPanelTitle} from "@angular/material/expansion";
-import { OgbootStatusComponent } from './components/ogboot-status/ogboot-status.component';
-import { CreatePxeBootFileComponent } from './components/pxe-boot-files/create-pxeBootFile/create-pxe-boot-file/create-pxe-boot-file.component';
+import { OgbootStatusComponent } from './components/ogboot/ogboot-status/ogboot-status.component';
+import { CreatePxeBootFileComponent } from './components/ogboot/pxe-boot-files/create-pxeBootFile/create-pxe-boot-file/create-pxe-boot-file.component';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
-import { DeleteImageComponent } from './components/images/images/delete-image/delete-image/delete-image.component';
-import { DeletePxeTemplateComponent } from './components/pxe/pxe/delete-pxeTemplate/delete-pxe-template/delete-pxe-template.component';
+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';
 
 @NgModule({
   declarations: [
@@ -131,7 +132,8 @@ import { DeletePxeTemplateComponent } from './components/pxe/pxe/delete-pxeTempl
     OgbootStatusComponent,
     CreatePxeBootFileComponent,
     DeleteImageComponent,
-    DeletePxeTemplateComponent
+    DeletePxeTemplateComponent,
+    OgdhcpComponent
   ],
   bootstrap: [AppComponent],
   imports: [BrowserModule,

ogWebconsole/src/app/components/groups/acctions-modal/acctions-modal.component.ts

@@ -2,7 +2,7 @@
 import { Component, Inject } from '@angular/core';
 import { MatDialogRef, MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog';
 import { ToastrService } from 'ngx-toastr';
-import { CreatePxeBootFileComponent } from '../../pxe-boot-files/create-pxeBootFile/create-pxe-boot-file/create-pxe-boot-file.component';
+import { CreatePxeBootFileComponent } from '../../ogboot/pxe-boot-files/create-pxeBootFile/create-pxe-boot-file/create-pxe-boot-file.component';
 @Component({
   selector: 'app-acctions-modal',
   templateUrl: './acctions-modal.component.html',

ogWebconsole/src/app/components/ogboot/pxe-boot-files/pxe-boot-files.component.ts

@@ -2,10 +2,8 @@ import { Component } from '@angular/core';
 import {MatTableDataSource} from "@angular/material/table";
 import {MatDialog} from "@angular/material/dialog";
 import {HttpClient} from "@angular/common/http";
-import {
-  CreatePxeTemplateComponent
-} from "../pxe/pxe/create-pxeTemplate/create-pxe-template/create-pxe-template.component";
-import {EditPxeTemplateComponent} from "../pxe/pxe/edit-pxe-template/edit-pxe-template.component";
+import { CreatePxeTemplateComponent } from '../pxe/pxe/create-pxeTemplate/create-pxe-template/create-pxe-template.component';
+import { EditPxeTemplateComponent } from '../pxe/pxe/edit-pxe-template/edit-pxe-template.component';
 import {PageEvent} from "@angular/material/paginator";
 
 @Component({

ogWebconsole/src/app/components/ogboot/pxe/pxe/edit-pxe-template/edit-pxe-template.component.ts

@@ -6,7 +6,7 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 @Component({
   selector: 'app-edit-pxe-template',
   templateUrl: './edit-pxe-template.component.html',
-  styleUrls: ['./edit-pxe-template.component.css'] // Corregido para 'styleUrls' plural
+  styleUrls: ['./edit-pxe-template.component.css'] 
 })
 export class EditPxeTemplateComponent implements OnInit {
   templateForm!: FormGroup;
@@ -19,10 +19,9 @@ export class EditPxeTemplateComponent implements OnInit {
   ) {}
 
   ngOnInit(): void {
-    // Configuración del formulario con los campos requeridos
     console.log(this.data);
     this.templateForm = this.fb.group({
-      name: [this.data.name || '', Validators.required], // Utilizar datos existentes o cadena vacía
+      name: [this.data.name || '', Validators.required],
       templateContent: [this.data.templateContent || '', Validators.required]
     });
   }
@@ -38,16 +37,16 @@ export class EditPxeTemplateComponent implements OnInit {
         .subscribe({
           next: () => {
             console.log('Plantilla actualizada correctamente');
-            this.dialogRef.close(true); // Cerrar el diálogo con éxito
+            this.dialogRef.close(true); 
           },
           error: (error) => {
-            console.error('Error al actualizar la plantilla:', error); // Manejo de errores
+            console.error('Error al actualizar la plantilla:', error); 
           }
         });
     }
   }
 
   onCancel(): void {
-    this.dialogRef.close(); // Cerrar el diálogo sin cambios
+    this.dialogRef.close(); 
   }
 }

ogWebconsole/src/app/components/ogdhcp/ogdhcp/ogdhcp.component.html

@@ -0,0 +1 @@
+<p>ogdhcp works!</p>

ogWebconsole/src/app/components/ogdhcp/ogdhcp/ogdhcp.component.spec.ts

@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { OgdhcpComponent } from './ogdhcp.component';
+
+describe('OgdhcpComponent', () => {
+  let component: OgdhcpComponent;
+  let fixture: ComponentFixture<OgdhcpComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [OgdhcpComponent]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(OgdhcpComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

ogWebconsole/src/app/components/ogdhcp/ogdhcp/ogdhcp.component.ts

@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-ogdhcp',
+  templateUrl: './ogdhcp.component.html',
+  styleUrl: './ogdhcp.component.css'
+})
+export class OgdhcpComponent {
+
+}