diff --git a/ogWebconsole/package-lock.json b/ogWebconsole/package-lock.json index 05f3952..795d43e 100644 --- a/ogWebconsole/package-lock.json +++ b/ogWebconsole/package-lock.json @@ -1,12 +1,12 @@ { "name": "og-webconsole", - "version": "0.0.0", + "version": "0.5.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "og-webconsole", - "version": "0.0.0", + "version": "0.5.0", "dependencies": { "@angular/animations": "^18.0.0", "@angular/cdk": "~18.0.0", @@ -20,6 +20,7 @@ "@angular/router": "^18.0.0", "@swimlane/ngx-charts": "^20.5.0", "jwt-decode": "^4.0.0", + "ngx-joyride": "^2.5.0", "ngx-toastr": "^19.0.0", "rxjs": "~7.8.0", "tslib": "^2.3.0", @@ -11228,6 +11229,18 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/ngx-joyride": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/ngx-joyride/-/ngx-joyride-2.5.0.tgz", + "integrity": "sha512-C/J8C4uWZjKl9aMmRBt9egVjuIpwWFplJgBZDl1EfqNVTJkdEC51nt9DpAOuDwOgkbArhJ9sZIk3bZT4vkud/w==", + "dependencies": { + "tslib": "^2.0.0" + }, + "peerDependencies": { + "@angular/common": ">=8.2.14", + "@angular/core": ">=8.2.14" + } + }, "node_modules/ngx-toastr": { "version": "19.0.0", "resolved": "https://registry.npmjs.org/ngx-toastr/-/ngx-toastr-19.0.0.tgz", diff --git a/ogWebconsole/package.json b/ogWebconsole/package.json index d769ca3..aa70969 100644 --- a/ogWebconsole/package.json +++ b/ogWebconsole/package.json @@ -22,6 +22,7 @@ "@angular/router": "^18.0.0", "@swimlane/ngx-charts": "^20.5.0", "jwt-decode": "^4.0.0", + "ngx-joyride": "^2.5.0", "ngx-toastr": "^19.0.0", "rxjs": "~7.8.0", "tslib": "^2.3.0", diff --git a/ogWebconsole/src/app/app.module.ts b/ogWebconsole/src/app/app.module.ts index 216fb55..18f6ec4 100644 --- a/ogWebconsole/src/app/app.module.ts +++ b/ogWebconsole/src/app/app.module.ts @@ -120,6 +120,7 @@ import { RepositoriesComponent } from './components/repositories/repositories.co import { CreateRepositoryComponent } from './components/repositories/create-repository/create-repository.component'; import { ExecuteCommandComponent } from './components/commands/main-commands/execute-command/execute-command.component'; import { ExecuteCommandOuComponent } from './components/groups/shared/execute-command-ou/execute-command-ou.component'; +import { JoyrideModule } from 'ngx-joyride'; @NgModule({ declarations: [ AppComponent, @@ -225,6 +226,7 @@ import { ExecuteCommandOuComponent } from './components/groups/shared/execute-co MatDatepickerModule, MatNativeDateModule, MatSliderModule, + JoyrideModule.forRoot(), ToastrModule.forRoot( { timeOut: 5000, diff --git a/ogWebconsole/src/app/components/calendar/calendar.component.html b/ogWebconsole/src/app/components/calendar/calendar.component.html index a776285..d26abdb 100644 --- a/ogWebconsole/src/app/components/calendar/calendar.component.html +++ b/ogWebconsole/src/app/components/calendar/calendar.component.html @@ -1,12 +1,17 @@
{{ column.header }} | @@ -35,7 +40,7 @@ | Acciones |
diff --git a/ogWebconsole/src/app/components/calendar/calendar.component.ts b/ogWebconsole/src/app/components/calendar/calendar.component.ts
index cc686b5..cbfb249 100644
--- a/ogWebconsole/src/app/components/calendar/calendar.component.ts
+++ b/ogWebconsole/src/app/components/calendar/calendar.component.ts
@@ -8,6 +8,7 @@ import { ToastrService } from "ngx-toastr";
import { PageEvent } from "@angular/material/paginator";
import { CreateCalendarComponent } from "./create-calendar/create-calendar.component";
import { DeleteModalComponent } from "../../shared/delete_modal/delete-modal/delete-modal.component";
+import { JoyrideService } from 'ngx-joyride';
@Component({
selector: 'app-calendar',
@@ -51,14 +52,14 @@ export class CalendarComponent implements OnInit {
}
];
displayedColumns = [...this.columns.map(column => column.columnDef), 'actions'];
-
private apiUrl = `${this.baseUrl}/remote-calendars`;
constructor(
public dialog: MatDialog,
private http: HttpClient,
private dataService: DataService,
- private toastService: ToastrService
+ private toastService: ToastrService,
+ private joyrideService: JoyrideService
) {}
ngOnInit(): void {
@@ -71,7 +72,6 @@ export class CalendarComponent implements OnInit {
});
dialogRef.afterClosed().subscribe(result => {
- console.log('The dialog was closed');
this.search();
});
}
@@ -84,24 +84,21 @@ export class CalendarComponent implements OnInit {
this.loading = false;
},
error => {
- console.error('Error fetching og lives', error);
+ console.error('Error fetching calendars', error);
this.loading = false;
}
);
}
sync(calendar: any): void {
- console.log('Syncing calendars');
this.syncUds = true;
this.http.post(`${this.apiUrl}/${calendar.uuid}/sync-uds`, {}).subscribe({
next: () => {
- console.log('Calendars synced successfully');
this.toastService.success('Calendarios sincronizados correctamente');
this.search();
this.syncUds = false;
},
error: (error) => {
- console.error('Error al sincronizar los calendarios:', error);
this.toastService.error(error.error['hydra:description']);
this.syncUds = false;
}
@@ -133,16 +130,13 @@ export class CalendarComponent implements OnInit {
this.http.delete(apiUrl).subscribe({
next: () => {
- console.log('Calendar deleted successfully');
this.search();
this.toastService.success('Calendar deleted successfully');
},
- error: (error) => {
+ error: () => {
this.toastService.error('Error deleting calendar');
}
});
- } else {
- console.log('calendar deletion cancelled');
}
});
}
@@ -155,8 +149,7 @@ export class CalendarComponent implements OnInit {
this.length = response['hydra:totalItems'];
this.loading = false;
},
- error: (error) => {
- console.error('Error al cargar las imágenes:', error);
+ error: () => {
this.loading = false;
}
});
@@ -167,4 +160,12 @@ export class CalendarComponent implements OnInit {
this.itemsPerPage = event.pageSize;
this.applyFilter();
}
+
+ iniciarTour(): void {
+ this.joyrideService.startTour({
+ steps: ['titleStep', 'addButtonStep', 'searchStep', 'tableStep', 'actionsStep'],
+ showPrevButton: true,
+ themeColor: '#3f51b5'
+ });
+ }
}
diff --git a/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.css b/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.css
index 377363e..b7adc08 100644
--- a/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.css
+++ b/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.css
@@ -21,7 +21,11 @@
}
.header-container {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
height: 100px;
+ padding: 10px;
}
.unidad-card, .elements-card {
diff --git a/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.html b/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.html
index 9817a5f..ff38ecc 100644
--- a/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.html
+++ b/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.html
@@ -1,7 +1,12 @@
-Búsqueda avanzada+
+
Búsqueda avanzada+ +
-
+ |
---|