-
Administrar Subredes
+ +Administrar Subredes
-
+
Buscar nombre de la subred
-
+
search
Pulsar 'enter' para buscar
-
+
Buscar netmask
-
+
search
Pulsar 'enter' para buscar
-
+
Buscar IP
-
+
search
Pulsar 'enter' para buscar
-
+
Buscar Boot file name
-
+
search
Pulsar 'enter' para buscar
+
| {{ column.header }} |
-
| Acciones |
-
+ |
+ | |
|---|
-
+
+([]);
@@ -52,14 +53,15 @@ export class OgDhcpSubnetsComponent {
{ columnDef: 'ipAddress', header: 'IP Address', cell: (subnet: Subnet) => subnet.ipAddress },
{ columnDef: 'nextServer', header: 'Next Server', cell: (subnet: Subnet) => subnet.nextServer },
{ columnDef: 'bootFileName', header: 'Boot File Name', cell: (subnet: Subnet) => subnet.bootFileName },
- { columnDef: 'synchronized', header: 'Sincronizado', cell: (subnet: Subnet) => `${subnet.synchronized}`},
+ { columnDef: 'synchronized', header: 'Sincronizado', cell: (subnet: Subnet) => `${subnet.synchronized}` },
{ columnDef: 'serverId', header: 'Id Servidor DHCP', cell: (subnet: Subnet) => subnet.serverId },
- { columnDef: 'clients', header: 'Lista de clientes', cell: (subnet: Subnet) => `${subnet.clients}`},
+ { columnDef: 'clients', header: 'Lista de clientes', cell: (subnet: Subnet) => `${subnet.clients}` },
];
private apiUrl = `${this.baseUrl}/subnets`;
- constructor(public dialog: MatDialog, private http: HttpClient, private toastService: ToastrService) {}
+ constructor(public dialog: MatDialog, private http: HttpClient, private toastService: ToastrService,
+ private joyrideService: JoyrideService) { }
ngOnInit() {
this.loadSubnets();
@@ -93,7 +95,7 @@ export class OgDhcpSubnetsComponent {
});
}
- toggleAction(subnet: any, action:string): void {
+ toggleAction(subnet: any, action: string): void {
switch (action) {
case 'get':
this.http.post(`${this.baseUrl}/og-dhcp/server/${subnet.uuid}/get`, {}).subscribe({
@@ -149,7 +151,8 @@ export class OgDhcpSubnetsComponent {
this.toastService.error(error.error['hydra:description']);
}
});
- }})
+ }
+ })
break;
default:
console.error('Acción no soportada:', action);
@@ -216,4 +219,26 @@ export class OgDhcpSubnetsComponent {
this.itemsPerPage = event.pageSize;
this.loadSubnets();
}
+
+ iniciarTour(): void {
+ this.joyrideService.startTour({
+ steps: [
+ 'serverInfoStep',
+ 'syncDbStep',
+ 'viewInfoStep',
+ 'titleStep',
+ 'addSubnetStep',
+ 'searchNameStep',
+ 'searchNetmaskStep',
+ 'searchIpStep',
+ 'searchBootFileStep',
+ 'tableStep',
+ 'actionsStep',
+ 'paginationStep'
+ ],
+ showPrevButton: true,
+ themeColor: '#3f51b5'
+ });
+ }
+
}
diff --git a/ogWebconsole/src/app/components/ogdhcp/og-dhcp-subnets/status/status.component.css b/ogWebconsole/src/app/components/ogdhcp/og-dhcp-subnets/status/status.component.css
index d0cc96f..e0992fd 100644
--- a/ogWebconsole/src/app/components/ogdhcp/og-dhcp-subnets/status/status.component.css
+++ b/ogWebconsole/src/app/components/ogdhcp/og-dhcp-subnets/status/status.component.css
@@ -78,11 +78,17 @@ th {
.button-container {
display: flex;
flex-direction: column;
- gap: 10px; /* Espacio entre botones */
+ gap: 10px;
margin-top: 50px;
}
-
+.header-container {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ height: 100px;
+ padding: 10px;
+}
.btn:first-child {
margin-left: 0;
diff --git a/ogWebconsole/src/app/components/ogdhcp/og-dhcp-subnets/status/status.component.html b/ogWebconsole/src/app/components/ogdhcp/og-dhcp-subnets/status/status.component.html
index 98b1b17..19464a8 100644
--- a/ogWebconsole/src/app/components/ogdhcp/og-dhcp-subnets/status/status.component.html
+++ b/ogWebconsole/src/app/components/ogdhcp/og-dhcp-subnets/status/status.component.html
@@ -1,8 +1,13 @@
+
diff --git a/ogWebconsole/src/app/components/ogdhcp/og-dhcp-subnets/og-dhcp-subnets.component.ts b/ogWebconsole/src/app/components/ogdhcp/og-dhcp-subnets/og-dhcp-subnets.component.ts
index b98cd7a..1641ad8 100644
--- a/ogWebconsole/src/app/components/ogdhcp/og-dhcp-subnets/og-dhcp-subnets.component.ts
+++ b/ogWebconsole/src/app/components/ogdhcp/og-dhcp-subnets/og-dhcp-subnets.component.ts
@@ -7,8 +7,9 @@ import { HttpClient } from '@angular/common/http';
import { DeleteModalComponent } from '../../../shared/delete_modal/delete-modal/delete-modal.component';
import { ToastrService } from 'ngx-toastr';
import { AddClientsToSubnetComponent } from './add-clients-to-subnet/add-clients-to-subnet.component';
-import {ServerInfoDialogComponent} from "./server-info-dialog/server-info-dialog.component";
-import {Observable} from "rxjs";
+import { ServerInfoDialogComponent } from "./server-info-dialog/server-info-dialog.component";
+import { Observable } from "rxjs";
+import { JoyrideService } from 'ngx-joyride';
export interface Subnet {
'@id': string;
@@ -32,7 +33,7 @@ export interface Subnet {
templateUrl: './og-dhcp-subnets.component.html',
styleUrls: ['./og-dhcp-subnets.component.css']
})
-export class OgDhcpSubnetsComponent {
+export class OgDhcpSubnetsComponent {
baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
displayedColumns: string[] = ['id', 'name', 'netmask', 'ipAddress', 'nextServer', 'bootFileName', 'synchronized', 'serverId', 'clients', 'actions'];
dataSource = new MatTableDataSource
-
OgDhcp server Status
+
+
OgDhcp server Status
+ +
-
+
-
Uso de disco
+
- Servicios
- - + {{ service.name }}: {{ service.status }}
+
-
diff --git a/ogWebconsole/src/app/components/ogdhcp/og-dhcp-subnets/status/status.component.ts b/ogWebconsole/src/app/components/ogdhcp/og-dhcp-subnets/status/status.component.ts
index 44885b3..eb743b4 100644
--- a/ogWebconsole/src/app/components/ogdhcp/og-dhcp-subnets/status/status.component.ts
+++ b/ogWebconsole/src/app/components/ogdhcp/og-dhcp-subnets/status/status.component.ts
@@ -1,5 +1,6 @@
import { Component } from '@angular/core';
import {HttpClient} from "@angular/common/http";
+import { JoyrideService } from 'ngx-joyride';
@Component({
selector: 'app-status',
@@ -23,7 +24,8 @@ export class StatusComponent {
domain: ['#FF6384', '#3f51b5']
};
- constructor(private http: HttpClient) {}
+ constructor(private http: HttpClient,
+ private joyrideService: JoyrideService) {}
ngOnInit(): void {
this.loadStatus();
@@ -55,4 +57,18 @@ export class StatusComponent {
status: this.servicesStatus[key]
}));
}
+
+ iniciarTour(): void {
+ this.joyrideService.startTour({
+ steps: [
+ 'titleStep',
+ 'diskUsageStep',
+ 'servicesStatusStep',
+ 'subnetsStep'
+ ],
+ showPrevButton: true,
+ themeColor: '#3f51b5'
+ });
+ }
+
}
diff --git a/ogWebconsole/src/app/components/operative-system/operative-system.component.html b/ogWebconsole/src/app/components/operative-system/operative-system.component.html
index 60589b9..0ad1eb3 100644
--- a/ogWebconsole/src/app/components/operative-system/operative-system.component.html
+++ b/ogWebconsole/src/app/components/operative-system/operative-system.component.html
@@ -1,22 +1,30 @@
+
+
-
Subredes
| ID | -Boot file name | -Next server | -Ip | -Ordenadores | -
|---|---|---|---|---|
| ID | +Boot file name | +Next server | +Ip | +Ordenadores | +
| {{ subnet.id }} | -{{ subnet['boot-file-name'] }} | -{{ subnet['next-server'] }} | -{{ subnet.subnet }} | -{{ subnet.reservations.length }} | -
| {{ subnet.id }} | +{{ subnet['boot-file-name'] }} | +{{ subnet['next-server'] }} | +{{ subnet.subnet }} | +{{ subnet.reservations.length }} | +
-
+
Administrar sistemas operativos
+ ++ Administrar sistemas operativos +
-
+
Buscar nombre de sistema operativo
search
Pulsar 'enter' para buscar
-| {{ column.header }} | -+ |
| Acciones |
+ Acciones |
-
-
+
+
|
|
|---|
+
+
{{ repositoryId ? 'Editar' : 'Añadir' }} repositorio
+
+
+
+
+
+
+
+
+
diff --git a/ogWebconsole/src/app/components/repositories/create-repository/create-repository.component.spec.ts b/ogWebconsole/src/app/components/repositories/create-repository/create-repository.component.spec.ts
new file mode 100644
index 0000000..fbdb87b
--- /dev/null
+++ b/ogWebconsole/src/app/components/repositories/create-repository/create-repository.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CreateRepositoryComponent } from './create-repository.component';
+
+describe('CreateRepositoryComponent', () => {
+ let component: CreateRepositoryComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [CreateRepositoryComponent]
+ })
+ .compileComponents();
+
+ fixture = TestBed.createComponent(CreateRepositoryComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/ogWebconsole/src/app/components/repositories/create-repository/create-repository.component.ts b/ogWebconsole/src/app/components/repositories/create-repository/create-repository.component.ts
new file mode 100644
index 0000000..634dd4f
--- /dev/null
+++ b/ogWebconsole/src/app/components/repositories/create-repository/create-repository.component.ts
@@ -0,0 +1,91 @@
+import {Component, Inject} from '@angular/core';
+import {FormBuilder, FormGroup, Validators} from "@angular/forms";
+import {HttpClient} from "@angular/common/http";
+import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog";
+import {ToastrService} from "ngx-toastr";
+import {DataService} from "../../images/data.service";
+
+@Component({
+ selector: 'app-create-repository',
+ templateUrl: './create-repository.component.html',
+ styleUrl: './create-repository.component.css'
+})
+export class CreateRepositoryComponent {
+ baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
+ imageForm: FormGroup;
+ repositoryId: string | null = null;
+ softwareProfiles: any[] = [];
+
+ constructor(
+ private fb: FormBuilder,
+ private http: HttpClient,
+ public dialogRef: MatDialogRef,
+ private toastService: ToastrService,
+ private dataService: DataService,
+ @Inject(MAT_DIALOG_DATA) public data: any
+ ) {
+ this.imageForm = this.fb.group({
+ name: ['', Validators.required],
+ ip: [''],
+ comments: [''],
+ });
+ }
+
+ ngOnInit() {
+ if (this.data) {
+ this.load()
+ }
+ }
+
+ load(): void {
+ this.dataService.getImage(this.data).subscribe({
+ next: (response) => {
+ this.imageForm = this.fb.group({
+ name: [response.name, Validators.required],
+ ip: [response.ip],
+ comments: [response.comments],
+ });
+ this.repositoryId = response['@id'];
+ },
+ error: (err) => {
+ console.error('Error fetching remote calendar:', err);
+ }
+ });
+ }
+
+ save(): void {
+ const payload = {
+ name: this.imageForm.value.name,
+ ip: this.imageForm.value.ip,
+ comments: this.imageForm.value.comments,
+ };
+
+ if (this.repositoryId) {
+ this.http.put(`${this.baseUrl}${this.repositoryId}`, payload).subscribe(
+ (response) => {
+ this.toastService.success('Imagen editada correctamente');
+ this.dialogRef.close();
+ },
+ (error) => {
+ this.toastService.error(error['error']['hydra:description']);
+ console.error('Error al editar la imagen', error);
+ }
+ );
+ } else {
+ this.http.post(`${this.baseUrl}/image-repositories`, payload).subscribe(
+ (response) => {
+ this.toastService.success('Imagen añadida correctamente');
+ this.dialogRef.close();
+ },
+ (error) => {
+ this.toastService.error(error['error']['hydra:description']);
+ console.error('Error al añadir la imagen', error);
+ }
+ );
+ }
+ }
+
+ close(): void {
+ this.dialogRef.close();
+ }
+}
diff --git a/ogWebconsole/src/app/components/repositories/repositories.component.css b/ogWebconsole/src/app/components/repositories/repositories.component.css
new file mode 100644
index 0000000..16117cb
--- /dev/null
+++ b/ogWebconsole/src/app/components/repositories/repositories.component.css
@@ -0,0 +1,102 @@
+.title {
+ font-size: 24px;
+}
+
+.images-button-row {
+ display: flex;
+ justify-content: flex-start;
+ margin-top: 16px;
+}
+
+.divider {
+ margin: 20px 0;
+}
+
+.lists-container {
+ padding: 16px;
+}
+
+.imagesLists-container {
+ flex: 1;
+}
+
+.card.unidad-card {
+ height: 100%;
+ box-sizing: border-box;
+}
+
+.image-container {
+ display: flex;
+ align-items: center;
+ margin-bottom: 16px;
+ border-bottom: 1px solid rgba(122, 122, 122, 0.555);
+}
+
+.image-container h4 {
+ margin: 0;
+ flex: 1;
+}
+
+.image-name{
+ cursor: pointer;
+}
+
+table {
+ width: 100%;
+ margin-top: 50px;
+}
+
+.search-container {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ width: 100%;
+ padding: 0 5px;
+ box-sizing: border-box;
+}
+
+.search-string {
+ flex: 2;
+ padding: 5px;
+}
+
+.search-boolean {
+ flex: 1;
+ padding: 5px;
+}
+
+.header-container {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 10px;
+}
+
+.mat-elevation-z8 {
+ box-shadow: 0px 0px 0px rgba(0,0,0,0.2);
+}
+
+.paginator-container {
+ display: flex;
+ justify-content: end;
+ margin-bottom: 30px;
+}
+
+.example-headers-align .mat-expansion-panel-header-description {
+ justify-content: space-between;
+ align-items: center;
+}
+
+.example-headers-align .mat-mdc-form-field + .mat-mdc-form-field {
+ margin-left: 8px;
+}
+
+.example-button-row {
+ display: table-cell;
+ max-width: 600px;
+}
+
+.example-button-row .mat-mdc-button-base {
+ margin: 8px 8px 8px 0;
+}
+
diff --git a/ogWebconsole/src/app/components/repositories/repositories.component.spec.ts b/ogWebconsole/src/app/components/repositories/repositories.component.spec.ts
new file mode 100644
index 0000000..7169583
--- /dev/null
+++ b/ogWebconsole/src/app/components/repositories/repositories.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { RepositoriesComponent } from './repositories.component';
+
+describe('RepositoriesComponent', () => {
+ let component: RepositoriesComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [RepositoriesComponent]
+ })
+ .compileComponents();
+
+ fixture = TestBed.createComponent(RepositoriesComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/ogWebconsole/src/app/components/repositories/repositories.component.ts b/ogWebconsole/src/app/components/repositories/repositories.component.ts
index c226c07..2fb0dc7 100644
--- a/ogWebconsole/src/app/components/repositories/repositories.component.ts
+++ b/ogWebconsole/src/app/components/repositories/repositories.component.ts
@@ -6,7 +6,7 @@ import {HttpClient} from "@angular/common/http";
import {ToastrService} from "ngx-toastr";
import {CreateImageComponent} from "../images/create-image/create-image.component";
import {DeleteModalComponent} from "../../shared/delete_modal/delete-modal/delete-modal.component";
-import {CreateRepositoryComponent} from "./create-repository/create-repository.component";
+import { CreateRepositoryComponent } from './create-repository/create-repository.component';
import { JoyrideService } from 'ngx-joyride';
@Component({
diff --git a/ogWebconsole/src/app/components/software-profile/create-software-profile/create-software-profile.component.html b/ogWebconsole/src/app/components/software-profile/create-software-profile/create-software-profile.component.html
index 325d220..a448bcc 100644
--- a/ogWebconsole/src/app/components/software-profile/create-software-profile/create-software-profile.component.html
+++ b/ogWebconsole/src/app/components/software-profile/create-software-profile/create-software-profile.component.html
@@ -2,7 +2,6 @@
-