diff --git a/ogWebconsole/src/app/app-routing.module.ts b/ogWebconsole/src/app/app-routing.module.ts index d6432c8..74b564d 100644 --- a/ogWebconsole/src/app/app-routing.module.ts +++ b/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' }, { diff --git a/ogWebconsole/src/app/app.module.ts b/ogWebconsole/src/app/app.module.ts index fe650f0..d5f26e3 100644 --- a/ogWebconsole/src/app/app.module.ts +++ b/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, diff --git a/ogWebconsole/src/app/components/pages/admin/admin.component.css b/ogWebconsole/src/app/components/admin/admin.component.css similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/admin.component.css rename to ogWebconsole/src/app/components/admin/admin.component.css diff --git a/ogWebconsole/src/app/components/pages/admin/admin.component.html b/ogWebconsole/src/app/components/admin/admin.component.html similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/admin.component.html rename to ogWebconsole/src/app/components/admin/admin.component.html diff --git a/ogWebconsole/src/app/components/pages/admin/admin.component.spec.ts b/ogWebconsole/src/app/components/admin/admin.component.spec.ts similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/admin.component.spec.ts rename to ogWebconsole/src/app/components/admin/admin.component.spec.ts diff --git a/ogWebconsole/src/app/components/pages/admin/admin.component.ts b/ogWebconsole/src/app/components/admin/admin.component.ts similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/admin.component.ts rename to ogWebconsole/src/app/components/admin/admin.component.ts diff --git a/ogWebconsole/src/app/components/pages/admin/roles/roles/add-role-modal/add-role-modal.component.css b/ogWebconsole/src/app/components/admin/roles/roles/add-role-modal/add-role-modal.component.css similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/roles/roles/add-role-modal/add-role-modal.component.css rename to ogWebconsole/src/app/components/admin/roles/roles/add-role-modal/add-role-modal.component.css diff --git a/ogWebconsole/src/app/components/pages/admin/roles/roles/add-role-modal/add-role-modal.component.html b/ogWebconsole/src/app/components/admin/roles/roles/add-role-modal/add-role-modal.component.html similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/roles/roles/add-role-modal/add-role-modal.component.html rename to ogWebconsole/src/app/components/admin/roles/roles/add-role-modal/add-role-modal.component.html diff --git a/ogWebconsole/src/app/components/pages/admin/roles/roles/add-role-modal/add-role-modal.component.spec.ts b/ogWebconsole/src/app/components/admin/roles/roles/add-role-modal/add-role-modal.component.spec.ts similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/roles/roles/add-role-modal/add-role-modal.component.spec.ts rename to ogWebconsole/src/app/components/admin/roles/roles/add-role-modal/add-role-modal.component.spec.ts diff --git a/ogWebconsole/src/app/components/pages/admin/roles/roles/add-role-modal/add-role-modal.component.ts b/ogWebconsole/src/app/components/admin/roles/roles/add-role-modal/add-role-modal.component.ts similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/roles/roles/add-role-modal/add-role-modal.component.ts rename to ogWebconsole/src/app/components/admin/roles/roles/add-role-modal/add-role-modal.component.ts diff --git a/ogWebconsole/src/app/components/pages/admin/roles/roles/delete-role-modal/delete-role-modal.component.css b/ogWebconsole/src/app/components/admin/roles/roles/delete-role-modal/delete-role-modal.component.css similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/roles/roles/delete-role-modal/delete-role-modal.component.css rename to ogWebconsole/src/app/components/admin/roles/roles/delete-role-modal/delete-role-modal.component.css diff --git a/ogWebconsole/src/app/components/pages/admin/roles/roles/delete-role-modal/delete-role-modal.component.html b/ogWebconsole/src/app/components/admin/roles/roles/delete-role-modal/delete-role-modal.component.html similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/roles/roles/delete-role-modal/delete-role-modal.component.html rename to ogWebconsole/src/app/components/admin/roles/roles/delete-role-modal/delete-role-modal.component.html diff --git a/ogWebconsole/src/app/components/pages/admin/roles/roles/delete-role-modal/delete-role-modal.component.spec.ts b/ogWebconsole/src/app/components/admin/roles/roles/delete-role-modal/delete-role-modal.component.spec.ts similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/roles/roles/delete-role-modal/delete-role-modal.component.spec.ts rename to ogWebconsole/src/app/components/admin/roles/roles/delete-role-modal/delete-role-modal.component.spec.ts diff --git a/ogWebconsole/src/app/components/pages/admin/roles/roles/delete-role-modal/delete-role-modal.component.ts b/ogWebconsole/src/app/components/admin/roles/roles/delete-role-modal/delete-role-modal.component.ts similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/roles/roles/delete-role-modal/delete-role-modal.component.ts rename to ogWebconsole/src/app/components/admin/roles/roles/delete-role-modal/delete-role-modal.component.ts diff --git a/ogWebconsole/src/app/components/pages/admin/roles/roles/roles.component.css b/ogWebconsole/src/app/components/admin/roles/roles/roles.component.css similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/roles/roles/roles.component.css rename to ogWebconsole/src/app/components/admin/roles/roles/roles.component.css diff --git a/ogWebconsole/src/app/components/pages/admin/roles/roles/roles.component.html b/ogWebconsole/src/app/components/admin/roles/roles/roles.component.html similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/roles/roles/roles.component.html rename to ogWebconsole/src/app/components/admin/roles/roles/roles.component.html diff --git a/ogWebconsole/src/app/components/pages/admin/roles/roles/roles.component.spec.ts b/ogWebconsole/src/app/components/admin/roles/roles/roles.component.spec.ts similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/roles/roles/roles.component.spec.ts rename to ogWebconsole/src/app/components/admin/roles/roles/roles.component.spec.ts diff --git a/ogWebconsole/src/app/components/pages/admin/roles/roles/roles.component.ts b/ogWebconsole/src/app/components/admin/roles/roles/roles.component.ts similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/roles/roles/roles.component.ts rename to ogWebconsole/src/app/components/admin/roles/roles/roles.component.ts diff --git a/ogWebconsole/src/app/components/pages/admin/roles/roles/roles.service.ts b/ogWebconsole/src/app/components/admin/roles/roles/roles.service.ts similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/roles/roles/roles.service.ts rename to ogWebconsole/src/app/components/admin/roles/roles/roles.service.ts diff --git a/ogWebconsole/src/app/components/pages/admin/users/users/add-user-modal/add-user-modal.component.css b/ogWebconsole/src/app/components/admin/users/users/add-user-modal/add-user-modal.component.css similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/users/users/add-user-modal/add-user-modal.component.css rename to ogWebconsole/src/app/components/admin/users/users/add-user-modal/add-user-modal.component.css diff --git a/ogWebconsole/src/app/components/pages/admin/users/users/add-user-modal/add-user-modal.component.html b/ogWebconsole/src/app/components/admin/users/users/add-user-modal/add-user-modal.component.html similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/users/users/add-user-modal/add-user-modal.component.html rename to ogWebconsole/src/app/components/admin/users/users/add-user-modal/add-user-modal.component.html diff --git a/ogWebconsole/src/app/components/pages/admin/users/users/add-user-modal/add-user-modal.component.spec.ts b/ogWebconsole/src/app/components/admin/users/users/add-user-modal/add-user-modal.component.spec.ts similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/users/users/add-user-modal/add-user-modal.component.spec.ts rename to ogWebconsole/src/app/components/admin/users/users/add-user-modal/add-user-modal.component.spec.ts diff --git a/ogWebconsole/src/app/components/pages/admin/users/users/add-user-modal/add-user-modal.component.ts b/ogWebconsole/src/app/components/admin/users/users/add-user-modal/add-user-modal.component.ts similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/users/users/add-user-modal/add-user-modal.component.ts rename to ogWebconsole/src/app/components/admin/users/users/add-user-modal/add-user-modal.component.ts diff --git a/ogWebconsole/src/app/components/pages/admin/users/users/change-password-modal/change-password-modal.component.css b/ogWebconsole/src/app/components/admin/users/users/change-password-modal/change-password-modal.component.css similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/users/users/change-password-modal/change-password-modal.component.css rename to ogWebconsole/src/app/components/admin/users/users/change-password-modal/change-password-modal.component.css diff --git a/ogWebconsole/src/app/components/pages/admin/users/users/change-password-modal/change-password-modal.component.html b/ogWebconsole/src/app/components/admin/users/users/change-password-modal/change-password-modal.component.html similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/users/users/change-password-modal/change-password-modal.component.html rename to ogWebconsole/src/app/components/admin/users/users/change-password-modal/change-password-modal.component.html diff --git a/ogWebconsole/src/app/components/pages/admin/users/users/change-password-modal/change-password-modal.component.spec.ts b/ogWebconsole/src/app/components/admin/users/users/change-password-modal/change-password-modal.component.spec.ts similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/users/users/change-password-modal/change-password-modal.component.spec.ts rename to ogWebconsole/src/app/components/admin/users/users/change-password-modal/change-password-modal.component.spec.ts diff --git a/ogWebconsole/src/app/components/pages/admin/users/users/change-password-modal/change-password-modal.component.ts b/ogWebconsole/src/app/components/admin/users/users/change-password-modal/change-password-modal.component.ts similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/users/users/change-password-modal/change-password-modal.component.ts rename to ogWebconsole/src/app/components/admin/users/users/change-password-modal/change-password-modal.component.ts diff --git a/ogWebconsole/src/app/components/pages/admin/users/users/delete-user-modal/delete-user-modal.component.css b/ogWebconsole/src/app/components/admin/users/users/delete-user-modal/delete-user-modal.component.css similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/users/users/delete-user-modal/delete-user-modal.component.css rename to ogWebconsole/src/app/components/admin/users/users/delete-user-modal/delete-user-modal.component.css diff --git a/ogWebconsole/src/app/components/pages/admin/users/users/delete-user-modal/delete-user-modal.component.html b/ogWebconsole/src/app/components/admin/users/users/delete-user-modal/delete-user-modal.component.html similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/users/users/delete-user-modal/delete-user-modal.component.html rename to ogWebconsole/src/app/components/admin/users/users/delete-user-modal/delete-user-modal.component.html diff --git a/ogWebconsole/src/app/components/pages/admin/users/users/delete-user-modal/delete-user-modal.component.spec.ts b/ogWebconsole/src/app/components/admin/users/users/delete-user-modal/delete-user-modal.component.spec.ts similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/users/users/delete-user-modal/delete-user-modal.component.spec.ts rename to ogWebconsole/src/app/components/admin/users/users/delete-user-modal/delete-user-modal.component.spec.ts diff --git a/ogWebconsole/src/app/components/pages/admin/users/users/delete-user-modal/delete-user-modal.component.ts b/ogWebconsole/src/app/components/admin/users/users/delete-user-modal/delete-user-modal.component.ts similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/users/users/delete-user-modal/delete-user-modal.component.ts rename to ogWebconsole/src/app/components/admin/users/users/delete-user-modal/delete-user-modal.component.ts diff --git a/ogWebconsole/src/app/components/pages/admin/users/users/edit-user-modal/edit-user-modal.component.css b/ogWebconsole/src/app/components/admin/users/users/edit-user-modal/edit-user-modal.component.css similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/users/users/edit-user-modal/edit-user-modal.component.css rename to ogWebconsole/src/app/components/admin/users/users/edit-user-modal/edit-user-modal.component.css diff --git a/ogWebconsole/src/app/components/pages/admin/users/users/edit-user-modal/edit-user-modal.component.html b/ogWebconsole/src/app/components/admin/users/users/edit-user-modal/edit-user-modal.component.html similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/users/users/edit-user-modal/edit-user-modal.component.html rename to ogWebconsole/src/app/components/admin/users/users/edit-user-modal/edit-user-modal.component.html diff --git a/ogWebconsole/src/app/components/pages/admin/users/users/edit-user-modal/edit-user-modal.component.spec.ts b/ogWebconsole/src/app/components/admin/users/users/edit-user-modal/edit-user-modal.component.spec.ts similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/users/users/edit-user-modal/edit-user-modal.component.spec.ts rename to ogWebconsole/src/app/components/admin/users/users/edit-user-modal/edit-user-modal.component.spec.ts diff --git a/ogWebconsole/src/app/components/pages/admin/users/users/edit-user-modal/edit-user-modal.component.ts b/ogWebconsole/src/app/components/admin/users/users/edit-user-modal/edit-user-modal.component.ts similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/users/users/edit-user-modal/edit-user-modal.component.ts rename to ogWebconsole/src/app/components/admin/users/users/edit-user-modal/edit-user-modal.component.ts diff --git a/ogWebconsole/src/app/components/pages/admin/users/users/users.component.css b/ogWebconsole/src/app/components/admin/users/users/users.component.css similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/users/users/users.component.css rename to ogWebconsole/src/app/components/admin/users/users/users.component.css diff --git a/ogWebconsole/src/app/components/pages/admin/users/users/users.component.html b/ogWebconsole/src/app/components/admin/users/users/users.component.html similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/users/users/users.component.html rename to ogWebconsole/src/app/components/admin/users/users/users.component.html diff --git a/ogWebconsole/src/app/components/pages/admin/users/users/users.component.spec.ts b/ogWebconsole/src/app/components/admin/users/users/users.component.spec.ts similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/users/users/users.component.spec.ts rename to ogWebconsole/src/app/components/admin/users/users/users.component.spec.ts diff --git a/ogWebconsole/src/app/components/pages/admin/users/users/users.component.ts b/ogWebconsole/src/app/components/admin/users/users/users.component.ts similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/users/users/users.component.ts rename to ogWebconsole/src/app/components/admin/users/users/users.component.ts diff --git a/ogWebconsole/src/app/components/pages/admin/users/users/users.service.ts b/ogWebconsole/src/app/components/admin/users/users/users.service.ts similarity index 100% rename from ogWebconsole/src/app/components/pages/admin/users/users/users.service.ts rename to ogWebconsole/src/app/components/admin/users/users/users.service.ts diff --git a/ogWebconsole/src/app/components/groups/acctions-modal/acctions-modal.component.ts b/ogWebconsole/src/app/components/groups/acctions-modal/acctions-modal.component.ts index 1855d16..bd6714e 100644 --- a/ogWebconsole/src/app/components/groups/acctions-modal/acctions-modal.component.ts +++ b/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', diff --git a/ogWebconsole/src/app/components/images/images/create-image/create-image/create-image.component.css b/ogWebconsole/src/app/components/ogboot/images/create-image/create-image/create-image.component.css similarity index 100% rename from ogWebconsole/src/app/components/images/images/create-image/create-image/create-image.component.css rename to ogWebconsole/src/app/components/ogboot/images/create-image/create-image/create-image.component.css diff --git a/ogWebconsole/src/app/components/images/images/create-image/create-image/create-image.component.html b/ogWebconsole/src/app/components/ogboot/images/create-image/create-image/create-image.component.html similarity index 100% rename from ogWebconsole/src/app/components/images/images/create-image/create-image/create-image.component.html rename to ogWebconsole/src/app/components/ogboot/images/create-image/create-image/create-image.component.html diff --git a/ogWebconsole/src/app/components/images/images/create-image/create-image/create-image.component.spec.ts b/ogWebconsole/src/app/components/ogboot/images/create-image/create-image/create-image.component.spec.ts similarity index 100% rename from ogWebconsole/src/app/components/images/images/create-image/create-image/create-image.component.spec.ts rename to ogWebconsole/src/app/components/ogboot/images/create-image/create-image/create-image.component.spec.ts diff --git a/ogWebconsole/src/app/components/images/images/create-image/create-image/create-image.component.ts b/ogWebconsole/src/app/components/ogboot/images/create-image/create-image/create-image.component.ts similarity index 100% rename from ogWebconsole/src/app/components/images/images/create-image/create-image/create-image.component.ts rename to ogWebconsole/src/app/components/ogboot/images/create-image/create-image/create-image.component.ts diff --git a/ogWebconsole/src/app/components/images/images/delete-image/delete-image/delete-image.component.css b/ogWebconsole/src/app/components/ogboot/images/delete-image/delete-image/delete-image.component.css similarity index 100% rename from ogWebconsole/src/app/components/images/images/delete-image/delete-image/delete-image.component.css rename to ogWebconsole/src/app/components/ogboot/images/delete-image/delete-image/delete-image.component.css diff --git a/ogWebconsole/src/app/components/images/images/delete-image/delete-image/delete-image.component.html b/ogWebconsole/src/app/components/ogboot/images/delete-image/delete-image/delete-image.component.html similarity index 100% rename from ogWebconsole/src/app/components/images/images/delete-image/delete-image/delete-image.component.html rename to ogWebconsole/src/app/components/ogboot/images/delete-image/delete-image/delete-image.component.html diff --git a/ogWebconsole/src/app/components/images/images/delete-image/delete-image/delete-image.component.spec.ts b/ogWebconsole/src/app/components/ogboot/images/delete-image/delete-image/delete-image.component.spec.ts similarity index 100% rename from ogWebconsole/src/app/components/images/images/delete-image/delete-image/delete-image.component.spec.ts rename to ogWebconsole/src/app/components/ogboot/images/delete-image/delete-image/delete-image.component.spec.ts diff --git a/ogWebconsole/src/app/components/images/images/delete-image/delete-image/delete-image.component.ts b/ogWebconsole/src/app/components/ogboot/images/delete-image/delete-image/delete-image.component.ts similarity index 100% rename from ogWebconsole/src/app/components/images/images/delete-image/delete-image/delete-image.component.ts rename to ogWebconsole/src/app/components/ogboot/images/delete-image/delete-image/delete-image.component.ts diff --git a/ogWebconsole/src/app/components/images/images/edit-image/edit-image/edit-image.component.css b/ogWebconsole/src/app/components/ogboot/images/edit-image/edit-image/edit-image.component.css similarity index 100% rename from ogWebconsole/src/app/components/images/images/edit-image/edit-image/edit-image.component.css rename to ogWebconsole/src/app/components/ogboot/images/edit-image/edit-image/edit-image.component.css diff --git a/ogWebconsole/src/app/components/images/images/edit-image/edit-image/edit-image.component.html b/ogWebconsole/src/app/components/ogboot/images/edit-image/edit-image/edit-image.component.html similarity index 100% rename from ogWebconsole/src/app/components/images/images/edit-image/edit-image/edit-image.component.html rename to ogWebconsole/src/app/components/ogboot/images/edit-image/edit-image/edit-image.component.html diff --git a/ogWebconsole/src/app/components/images/images/edit-image/edit-image/edit-image.component.spec.ts b/ogWebconsole/src/app/components/ogboot/images/edit-image/edit-image/edit-image.component.spec.ts similarity index 100% rename from ogWebconsole/src/app/components/images/images/edit-image/edit-image/edit-image.component.spec.ts rename to ogWebconsole/src/app/components/ogboot/images/edit-image/edit-image/edit-image.component.spec.ts diff --git a/ogWebconsole/src/app/components/images/images/edit-image/edit-image/edit-image.component.ts b/ogWebconsole/src/app/components/ogboot/images/edit-image/edit-image/edit-image.component.ts similarity index 100% rename from ogWebconsole/src/app/components/images/images/edit-image/edit-image/edit-image.component.ts rename to ogWebconsole/src/app/components/ogboot/images/edit-image/edit-image/edit-image.component.ts diff --git a/ogWebconsole/src/app/components/images/images/images.component.css b/ogWebconsole/src/app/components/ogboot/images/images.component.css similarity index 100% rename from ogWebconsole/src/app/components/images/images/images.component.css rename to ogWebconsole/src/app/components/ogboot/images/images.component.css diff --git a/ogWebconsole/src/app/components/images/images/images.component.html b/ogWebconsole/src/app/components/ogboot/images/images.component.html similarity index 100% rename from ogWebconsole/src/app/components/images/images/images.component.html rename to ogWebconsole/src/app/components/ogboot/images/images.component.html diff --git a/ogWebconsole/src/app/components/images/images/images.component.spec.ts b/ogWebconsole/src/app/components/ogboot/images/images.component.spec.ts similarity index 100% rename from ogWebconsole/src/app/components/images/images/images.component.spec.ts rename to ogWebconsole/src/app/components/ogboot/images/images.component.spec.ts diff --git a/ogWebconsole/src/app/components/images/images/images.component.ts b/ogWebconsole/src/app/components/ogboot/images/images.component.ts similarity index 100% rename from ogWebconsole/src/app/components/images/images/images.component.ts rename to ogWebconsole/src/app/components/ogboot/images/images.component.ts diff --git a/ogWebconsole/src/app/components/images/images/info-image/info-image/info-image.component.css b/ogWebconsole/src/app/components/ogboot/images/info-image/info-image/info-image.component.css similarity index 100% rename from ogWebconsole/src/app/components/images/images/info-image/info-image/info-image.component.css rename to ogWebconsole/src/app/components/ogboot/images/info-image/info-image/info-image.component.css diff --git a/ogWebconsole/src/app/components/images/images/info-image/info-image/info-image.component.html b/ogWebconsole/src/app/components/ogboot/images/info-image/info-image/info-image.component.html similarity index 100% rename from ogWebconsole/src/app/components/images/images/info-image/info-image/info-image.component.html rename to ogWebconsole/src/app/components/ogboot/images/info-image/info-image/info-image.component.html diff --git a/ogWebconsole/src/app/components/images/images/info-image/info-image/info-image.component.spec.ts b/ogWebconsole/src/app/components/ogboot/images/info-image/info-image/info-image.component.spec.ts similarity index 100% rename from ogWebconsole/src/app/components/images/images/info-image/info-image/info-image.component.spec.ts rename to ogWebconsole/src/app/components/ogboot/images/info-image/info-image/info-image.component.spec.ts diff --git a/ogWebconsole/src/app/components/images/images/info-image/info-image/info-image.component.ts b/ogWebconsole/src/app/components/ogboot/images/info-image/info-image/info-image.component.ts similarity index 100% rename from ogWebconsole/src/app/components/images/images/info-image/info-image/info-image.component.ts rename to ogWebconsole/src/app/components/ogboot/images/info-image/info-image/info-image.component.ts diff --git a/ogWebconsole/src/app/components/ogboot-status/ogboot-status.component.css b/ogWebconsole/src/app/components/ogboot/ogboot-status/ogboot-status.component.css similarity index 100% rename from ogWebconsole/src/app/components/ogboot-status/ogboot-status.component.css rename to ogWebconsole/src/app/components/ogboot/ogboot-status/ogboot-status.component.css diff --git a/ogWebconsole/src/app/components/ogboot-status/ogboot-status.component.html b/ogWebconsole/src/app/components/ogboot/ogboot-status/ogboot-status.component.html similarity index 100% rename from ogWebconsole/src/app/components/ogboot-status/ogboot-status.component.html rename to ogWebconsole/src/app/components/ogboot/ogboot-status/ogboot-status.component.html diff --git a/ogWebconsole/src/app/components/ogboot-status/ogboot-status.component.spec.ts b/ogWebconsole/src/app/components/ogboot/ogboot-status/ogboot-status.component.spec.ts similarity index 100% rename from ogWebconsole/src/app/components/ogboot-status/ogboot-status.component.spec.ts rename to ogWebconsole/src/app/components/ogboot/ogboot-status/ogboot-status.component.spec.ts diff --git a/ogWebconsole/src/app/components/ogboot-status/ogboot-status.component.ts b/ogWebconsole/src/app/components/ogboot/ogboot-status/ogboot-status.component.ts similarity index 100% rename from ogWebconsole/src/app/components/ogboot-status/ogboot-status.component.ts rename to ogWebconsole/src/app/components/ogboot/ogboot-status/ogboot-status.component.ts diff --git a/ogWebconsole/src/app/components/pxe-boot-files/create-pxeBootFile/create-pxe-boot-file/create-pxe-boot-file.component.css b/ogWebconsole/src/app/components/ogboot/pxe-boot-files/create-pxeBootFile/create-pxe-boot-file/create-pxe-boot-file.component.css similarity index 100% rename from ogWebconsole/src/app/components/pxe-boot-files/create-pxeBootFile/create-pxe-boot-file/create-pxe-boot-file.component.css rename to ogWebconsole/src/app/components/ogboot/pxe-boot-files/create-pxeBootFile/create-pxe-boot-file/create-pxe-boot-file.component.css diff --git a/ogWebconsole/src/app/components/pxe-boot-files/create-pxeBootFile/create-pxe-boot-file/create-pxe-boot-file.component.html b/ogWebconsole/src/app/components/ogboot/pxe-boot-files/create-pxeBootFile/create-pxe-boot-file/create-pxe-boot-file.component.html similarity index 100% rename from ogWebconsole/src/app/components/pxe-boot-files/create-pxeBootFile/create-pxe-boot-file/create-pxe-boot-file.component.html rename to ogWebconsole/src/app/components/ogboot/pxe-boot-files/create-pxeBootFile/create-pxe-boot-file/create-pxe-boot-file.component.html diff --git a/ogWebconsole/src/app/components/pxe-boot-files/create-pxeBootFile/create-pxe-boot-file/create-pxe-boot-file.component.spec.ts b/ogWebconsole/src/app/components/ogboot/pxe-boot-files/create-pxeBootFile/create-pxe-boot-file/create-pxe-boot-file.component.spec.ts similarity index 100% rename from ogWebconsole/src/app/components/pxe-boot-files/create-pxeBootFile/create-pxe-boot-file/create-pxe-boot-file.component.spec.ts rename to ogWebconsole/src/app/components/ogboot/pxe-boot-files/create-pxeBootFile/create-pxe-boot-file/create-pxe-boot-file.component.spec.ts diff --git a/ogWebconsole/src/app/components/pxe-boot-files/create-pxeBootFile/create-pxe-boot-file/create-pxe-boot-file.component.ts b/ogWebconsole/src/app/components/ogboot/pxe-boot-files/create-pxeBootFile/create-pxe-boot-file/create-pxe-boot-file.component.ts similarity index 100% rename from ogWebconsole/src/app/components/pxe-boot-files/create-pxeBootFile/create-pxe-boot-file/create-pxe-boot-file.component.ts rename to ogWebconsole/src/app/components/ogboot/pxe-boot-files/create-pxeBootFile/create-pxe-boot-file/create-pxe-boot-file.component.ts diff --git a/ogWebconsole/src/app/components/pxe-boot-files/pxe-boot-files.component.css b/ogWebconsole/src/app/components/ogboot/pxe-boot-files/pxe-boot-files.component.css similarity index 100% rename from ogWebconsole/src/app/components/pxe-boot-files/pxe-boot-files.component.css rename to ogWebconsole/src/app/components/ogboot/pxe-boot-files/pxe-boot-files.component.css diff --git a/ogWebconsole/src/app/components/pxe-boot-files/pxe-boot-files.component.html b/ogWebconsole/src/app/components/ogboot/pxe-boot-files/pxe-boot-files.component.html similarity index 100% rename from ogWebconsole/src/app/components/pxe-boot-files/pxe-boot-files.component.html rename to ogWebconsole/src/app/components/ogboot/pxe-boot-files/pxe-boot-files.component.html diff --git a/ogWebconsole/src/app/components/pxe-boot-files/pxe-boot-files.component.spec.ts b/ogWebconsole/src/app/components/ogboot/pxe-boot-files/pxe-boot-files.component.spec.ts similarity index 100% rename from ogWebconsole/src/app/components/pxe-boot-files/pxe-boot-files.component.spec.ts rename to ogWebconsole/src/app/components/ogboot/pxe-boot-files/pxe-boot-files.component.spec.ts diff --git a/ogWebconsole/src/app/components/pxe-boot-files/pxe-boot-files.component.ts b/ogWebconsole/src/app/components/ogboot/pxe-boot-files/pxe-boot-files.component.ts similarity index 94% rename from ogWebconsole/src/app/components/pxe-boot-files/pxe-boot-files.component.ts rename to ogWebconsole/src/app/components/ogboot/pxe-boot-files/pxe-boot-files.component.ts index 4af2d65..573dca2 100644 --- a/ogWebconsole/src/app/components/pxe-boot-files/pxe-boot-files.component.ts +++ b/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({ diff --git a/ogWebconsole/src/app/components/pxe/pxe/create-pxeTemplate/create-pxe-template/create-pxe-template.component.css b/ogWebconsole/src/app/components/ogboot/pxe/pxe/create-pxeTemplate/create-pxe-template/create-pxe-template.component.css similarity index 100% rename from ogWebconsole/src/app/components/pxe/pxe/create-pxeTemplate/create-pxe-template/create-pxe-template.component.css rename to ogWebconsole/src/app/components/ogboot/pxe/pxe/create-pxeTemplate/create-pxe-template/create-pxe-template.component.css diff --git a/ogWebconsole/src/app/components/pxe/pxe/create-pxeTemplate/create-pxe-template/create-pxe-template.component.html b/ogWebconsole/src/app/components/ogboot/pxe/pxe/create-pxeTemplate/create-pxe-template/create-pxe-template.component.html similarity index 100% rename from ogWebconsole/src/app/components/pxe/pxe/create-pxeTemplate/create-pxe-template/create-pxe-template.component.html rename to ogWebconsole/src/app/components/ogboot/pxe/pxe/create-pxeTemplate/create-pxe-template/create-pxe-template.component.html diff --git a/ogWebconsole/src/app/components/pxe/pxe/create-pxeTemplate/create-pxe-template/create-pxe-template.component.spec.ts b/ogWebconsole/src/app/components/ogboot/pxe/pxe/create-pxeTemplate/create-pxe-template/create-pxe-template.component.spec.ts similarity index 100% rename from ogWebconsole/src/app/components/pxe/pxe/create-pxeTemplate/create-pxe-template/create-pxe-template.component.spec.ts rename to ogWebconsole/src/app/components/ogboot/pxe/pxe/create-pxeTemplate/create-pxe-template/create-pxe-template.component.spec.ts diff --git a/ogWebconsole/src/app/components/pxe/pxe/create-pxeTemplate/create-pxe-template/create-pxe-template.component.ts b/ogWebconsole/src/app/components/ogboot/pxe/pxe/create-pxeTemplate/create-pxe-template/create-pxe-template.component.ts similarity index 100% rename from ogWebconsole/src/app/components/pxe/pxe/create-pxeTemplate/create-pxe-template/create-pxe-template.component.ts rename to ogWebconsole/src/app/components/ogboot/pxe/pxe/create-pxeTemplate/create-pxe-template/create-pxe-template.component.ts diff --git a/ogWebconsole/src/app/components/pxe/pxe/delete-pxeTemplate/delete-pxe-template/delete-pxe-template.component.css b/ogWebconsole/src/app/components/ogboot/pxe/pxe/delete-pxeTemplate/delete-pxe-template/delete-pxe-template.component.css similarity index 100% rename from ogWebconsole/src/app/components/pxe/pxe/delete-pxeTemplate/delete-pxe-template/delete-pxe-template.component.css rename to ogWebconsole/src/app/components/ogboot/pxe/pxe/delete-pxeTemplate/delete-pxe-template/delete-pxe-template.component.css diff --git a/ogWebconsole/src/app/components/pxe/pxe/delete-pxeTemplate/delete-pxe-template/delete-pxe-template.component.html b/ogWebconsole/src/app/components/ogboot/pxe/pxe/delete-pxeTemplate/delete-pxe-template/delete-pxe-template.component.html similarity index 100% rename from ogWebconsole/src/app/components/pxe/pxe/delete-pxeTemplate/delete-pxe-template/delete-pxe-template.component.html rename to ogWebconsole/src/app/components/ogboot/pxe/pxe/delete-pxeTemplate/delete-pxe-template/delete-pxe-template.component.html diff --git a/ogWebconsole/src/app/components/pxe/pxe/delete-pxeTemplate/delete-pxe-template/delete-pxe-template.component.spec.ts b/ogWebconsole/src/app/components/ogboot/pxe/pxe/delete-pxeTemplate/delete-pxe-template/delete-pxe-template.component.spec.ts similarity index 100% rename from ogWebconsole/src/app/components/pxe/pxe/delete-pxeTemplate/delete-pxe-template/delete-pxe-template.component.spec.ts rename to ogWebconsole/src/app/components/ogboot/pxe/pxe/delete-pxeTemplate/delete-pxe-template/delete-pxe-template.component.spec.ts diff --git a/ogWebconsole/src/app/components/pxe/pxe/delete-pxeTemplate/delete-pxe-template/delete-pxe-template.component.ts b/ogWebconsole/src/app/components/ogboot/pxe/pxe/delete-pxeTemplate/delete-pxe-template/delete-pxe-template.component.ts similarity index 100% rename from ogWebconsole/src/app/components/pxe/pxe/delete-pxeTemplate/delete-pxe-template/delete-pxe-template.component.ts rename to ogWebconsole/src/app/components/ogboot/pxe/pxe/delete-pxeTemplate/delete-pxe-template/delete-pxe-template.component.ts diff --git a/ogWebconsole/src/app/components/pxe/pxe/edit-pxe-template/edit-pxe-template.component.css b/ogWebconsole/src/app/components/ogboot/pxe/pxe/edit-pxe-template/edit-pxe-template.component.css similarity index 100% rename from ogWebconsole/src/app/components/pxe/pxe/edit-pxe-template/edit-pxe-template.component.css rename to ogWebconsole/src/app/components/ogboot/pxe/pxe/edit-pxe-template/edit-pxe-template.component.css diff --git a/ogWebconsole/src/app/components/pxe/pxe/edit-pxe-template/edit-pxe-template.component.html b/ogWebconsole/src/app/components/ogboot/pxe/pxe/edit-pxe-template/edit-pxe-template.component.html similarity index 100% rename from ogWebconsole/src/app/components/pxe/pxe/edit-pxe-template/edit-pxe-template.component.html rename to ogWebconsole/src/app/components/ogboot/pxe/pxe/edit-pxe-template/edit-pxe-template.component.html diff --git a/ogWebconsole/src/app/components/pxe/pxe/edit-pxe-template/edit-pxe-template.component.spec.ts b/ogWebconsole/src/app/components/ogboot/pxe/pxe/edit-pxe-template/edit-pxe-template.component.spec.ts similarity index 100% rename from ogWebconsole/src/app/components/pxe/pxe/edit-pxe-template/edit-pxe-template.component.spec.ts rename to ogWebconsole/src/app/components/ogboot/pxe/pxe/edit-pxe-template/edit-pxe-template.component.spec.ts diff --git a/ogWebconsole/src/app/components/pxe/pxe/edit-pxe-template/edit-pxe-template.component.ts b/ogWebconsole/src/app/components/ogboot/pxe/pxe/edit-pxe-template/edit-pxe-template.component.ts similarity index 77% rename from ogWebconsole/src/app/components/pxe/pxe/edit-pxe-template/edit-pxe-template.component.ts rename to ogWebconsole/src/app/components/ogboot/pxe/pxe/edit-pxe-template/edit-pxe-template.component.ts index d53b03b..f13c4e7 100644 --- a/ogWebconsole/src/app/components/pxe/pxe/edit-pxe-template/edit-pxe-template.component.ts +++ b/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(); } } diff --git a/ogWebconsole/src/app/components/pxe/pxe/pxe.component.css b/ogWebconsole/src/app/components/ogboot/pxe/pxe/pxe.component.css similarity index 100% rename from ogWebconsole/src/app/components/pxe/pxe/pxe.component.css rename to ogWebconsole/src/app/components/ogboot/pxe/pxe/pxe.component.css diff --git a/ogWebconsole/src/app/components/pxe/pxe/pxe.component.html b/ogWebconsole/src/app/components/ogboot/pxe/pxe/pxe.component.html similarity index 100% rename from ogWebconsole/src/app/components/pxe/pxe/pxe.component.html rename to ogWebconsole/src/app/components/ogboot/pxe/pxe/pxe.component.html diff --git a/ogWebconsole/src/app/components/pxe/pxe/pxe.component.spec.ts b/ogWebconsole/src/app/components/ogboot/pxe/pxe/pxe.component.spec.ts similarity index 100% rename from ogWebconsole/src/app/components/pxe/pxe/pxe.component.spec.ts rename to ogWebconsole/src/app/components/ogboot/pxe/pxe/pxe.component.spec.ts diff --git a/ogWebconsole/src/app/components/pxe/pxe/pxe.component.ts b/ogWebconsole/src/app/components/ogboot/pxe/pxe/pxe.component.ts similarity index 100% rename from ogWebconsole/src/app/components/pxe/pxe/pxe.component.ts rename to ogWebconsole/src/app/components/ogboot/pxe/pxe/pxe.component.ts diff --git a/ogWebconsole/src/app/components/layout/auth-layout/auth-layout.component.css b/ogWebconsole/src/app/components/ogdhcp/ogdhcp/ogdhcp.component.css similarity index 100% rename from ogWebconsole/src/app/components/layout/auth-layout/auth-layout.component.css rename to ogWebconsole/src/app/components/ogdhcp/ogdhcp/ogdhcp.component.css diff --git a/ogWebconsole/src/app/components/ogdhcp/ogdhcp/ogdhcp.component.html b/ogWebconsole/src/app/components/ogdhcp/ogdhcp/ogdhcp.component.html new file mode 100644 index 0000000..d680125 --- /dev/null +++ b/ogWebconsole/src/app/components/ogdhcp/ogdhcp/ogdhcp.component.html @@ -0,0 +1 @@ +

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 new file mode 100644 index 0000000..0ab958d --- /dev/null +++ b/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; + + 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 new file mode 100644 index 0000000..a8ee1b5 --- /dev/null +++ b/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 { + +} diff --git a/ogWebconsole/src/app/services/custom.interceptor.spec.ts b/ogWebconsole/src/app/core/services/custom.interceptor.spec.ts similarity index 100% rename from ogWebconsole/src/app/services/custom.interceptor.spec.ts rename to ogWebconsole/src/app/core/services/custom.interceptor.spec.ts diff --git a/ogWebconsole/src/app/services/custom.interceptor.ts b/ogWebconsole/src/app/core/services/custom.interceptor.ts similarity index 100% rename from ogWebconsole/src/app/services/custom.interceptor.ts rename to ogWebconsole/src/app/core/services/custom.interceptor.ts diff --git a/ogWebconsole/src/app/components/page-not-found/page-not-found.component.css b/ogWebconsole/src/app/layout/auth-layout/auth-layout.component.css similarity index 100% rename from ogWebconsole/src/app/components/page-not-found/page-not-found.component.css rename to ogWebconsole/src/app/layout/auth-layout/auth-layout.component.css diff --git a/ogWebconsole/src/app/components/layout/auth-layout/auth-layout.component.html b/ogWebconsole/src/app/layout/auth-layout/auth-layout.component.html similarity index 100% rename from ogWebconsole/src/app/components/layout/auth-layout/auth-layout.component.html rename to ogWebconsole/src/app/layout/auth-layout/auth-layout.component.html diff --git a/ogWebconsole/src/app/components/layout/auth-layout/auth-layout.component.spec.ts b/ogWebconsole/src/app/layout/auth-layout/auth-layout.component.spec.ts similarity index 100% rename from ogWebconsole/src/app/components/layout/auth-layout/auth-layout.component.spec.ts rename to ogWebconsole/src/app/layout/auth-layout/auth-layout.component.spec.ts diff --git a/ogWebconsole/src/app/components/layout/auth-layout/auth-layout.component.ts b/ogWebconsole/src/app/layout/auth-layout/auth-layout.component.ts similarity index 100% rename from ogWebconsole/src/app/components/layout/auth-layout/auth-layout.component.ts rename to ogWebconsole/src/app/layout/auth-layout/auth-layout.component.ts diff --git a/ogWebconsole/src/app/components/layout/header/header.component.css b/ogWebconsole/src/app/layout/header/header.component.css similarity index 100% rename from ogWebconsole/src/app/components/layout/header/header.component.css rename to ogWebconsole/src/app/layout/header/header.component.css diff --git a/ogWebconsole/src/app/components/layout/header/header.component.html b/ogWebconsole/src/app/layout/header/header.component.html similarity index 100% rename from ogWebconsole/src/app/components/layout/header/header.component.html rename to ogWebconsole/src/app/layout/header/header.component.html diff --git a/ogWebconsole/src/app/components/layout/header/header.component.spec.ts b/ogWebconsole/src/app/layout/header/header.component.spec.ts similarity index 100% rename from ogWebconsole/src/app/components/layout/header/header.component.spec.ts rename to ogWebconsole/src/app/layout/header/header.component.spec.ts diff --git a/ogWebconsole/src/app/components/layout/header/header.component.ts b/ogWebconsole/src/app/layout/header/header.component.ts similarity index 91% rename from ogWebconsole/src/app/components/layout/header/header.component.ts rename to ogWebconsole/src/app/layout/header/header.component.ts index 97d0c99..6d02b20 100644 --- a/ogWebconsole/src/app/components/layout/header/header.component.ts +++ b/ogWebconsole/src/app/layout/header/header.component.ts @@ -1,8 +1,6 @@ import { Component, EventEmitter, OnInit, Output } from '@angular/core'; import {jwtDecode} from 'jwt-decode'; -import { - ChangePasswordModalComponent -} from "../../pages/admin/users/users/change-password-modal/change-password-modal.component"; +import { ChangePasswordModalComponent } from '../../components/admin/users/users/change-password-modal/change-password-modal.component'; import {MatDialog} from "@angular/material/dialog"; @Component({ diff --git a/ogWebconsole/src/app/components/layout/main-layout/main-layout.component.css b/ogWebconsole/src/app/layout/main-layout/main-layout.component.css similarity index 100% rename from ogWebconsole/src/app/components/layout/main-layout/main-layout.component.css rename to ogWebconsole/src/app/layout/main-layout/main-layout.component.css diff --git a/ogWebconsole/src/app/components/layout/main-layout/main-layout.component.html b/ogWebconsole/src/app/layout/main-layout/main-layout.component.html similarity index 100% rename from ogWebconsole/src/app/components/layout/main-layout/main-layout.component.html rename to ogWebconsole/src/app/layout/main-layout/main-layout.component.html diff --git a/ogWebconsole/src/app/components/layout/main-layout/main-layout.component.spec.ts b/ogWebconsole/src/app/layout/main-layout/main-layout.component.spec.ts similarity index 100% rename from ogWebconsole/src/app/components/layout/main-layout/main-layout.component.spec.ts rename to ogWebconsole/src/app/layout/main-layout/main-layout.component.spec.ts diff --git a/ogWebconsole/src/app/components/layout/main-layout/main-layout.component.ts b/ogWebconsole/src/app/layout/main-layout/main-layout.component.ts similarity index 100% rename from ogWebconsole/src/app/components/layout/main-layout/main-layout.component.ts rename to ogWebconsole/src/app/layout/main-layout/main-layout.component.ts diff --git a/ogWebconsole/src/app/components/layout/sidebar/sidebar.component.css b/ogWebconsole/src/app/layout/sidebar/sidebar.component.css similarity index 100% rename from ogWebconsole/src/app/components/layout/sidebar/sidebar.component.css rename to ogWebconsole/src/app/layout/sidebar/sidebar.component.css diff --git a/ogWebconsole/src/app/components/layout/sidebar/sidebar.component.html b/ogWebconsole/src/app/layout/sidebar/sidebar.component.html similarity index 100% rename from ogWebconsole/src/app/components/layout/sidebar/sidebar.component.html rename to ogWebconsole/src/app/layout/sidebar/sidebar.component.html diff --git a/ogWebconsole/src/app/components/layout/sidebar/sidebar.component.spec.ts b/ogWebconsole/src/app/layout/sidebar/sidebar.component.spec.ts similarity index 100% rename from ogWebconsole/src/app/components/layout/sidebar/sidebar.component.spec.ts rename to ogWebconsole/src/app/layout/sidebar/sidebar.component.spec.ts diff --git a/ogWebconsole/src/app/components/layout/sidebar/sidebar.component.ts b/ogWebconsole/src/app/layout/sidebar/sidebar.component.ts similarity index 79% rename from ogWebconsole/src/app/components/layout/sidebar/sidebar.component.ts rename to ogWebconsole/src/app/layout/sidebar/sidebar.component.ts index 46b38dd..707ce98 100644 --- a/ogWebconsole/src/app/components/layout/sidebar/sidebar.component.ts +++ b/ogWebconsole/src/app/layout/sidebar/sidebar.component.ts @@ -1,9 +1,8 @@ import { Component, Input } from '@angular/core'; import { jwtDecode } from 'jwt-decode'; -import { EditUserModalComponent } from '../../pages/admin/users/users/edit-user-modal/edit-user-modal.component'; +import { EditUserModalComponent } from '../../components/admin/users/users/edit-user-modal/edit-user-modal.component'; import { MatDialog } from '@angular/material/dialog'; -import { ChangePasswordModalComponent } from '../../pages/admin/users/users/change-password-modal/change-password-modal.component'; - +import { ChangePasswordModalComponent } from '../../components/admin/users/users/change-password-modal/change-password-modal.component'; @Component({ selector: 'app-sidebar', templateUrl: './sidebar.component.html', diff --git a/ogWebconsole/src/app/shared/page-not-found/page-not-found.component.css b/ogWebconsole/src/app/shared/page-not-found/page-not-found.component.css new file mode 100644 index 0000000..e69de29 diff --git a/ogWebconsole/src/app/components/page-not-found/page-not-found.component.html b/ogWebconsole/src/app/shared/page-not-found/page-not-found.component.html similarity index 100% rename from ogWebconsole/src/app/components/page-not-found/page-not-found.component.html rename to ogWebconsole/src/app/shared/page-not-found/page-not-found.component.html diff --git a/ogWebconsole/src/app/components/page-not-found/page-not-found.component.spec.ts b/ogWebconsole/src/app/shared/page-not-found/page-not-found.component.spec.ts similarity index 100% rename from ogWebconsole/src/app/components/page-not-found/page-not-found.component.spec.ts rename to ogWebconsole/src/app/shared/page-not-found/page-not-found.component.spec.ts diff --git a/ogWebconsole/src/app/components/page-not-found/page-not-found.component.ts b/ogWebconsole/src/app/shared/page-not-found/page-not-found.component.ts similarity index 100% rename from ogWebconsole/src/app/components/page-not-found/page-not-found.component.ts rename to ogWebconsole/src/app/shared/page-not-found/page-not-found.component.ts