diff --git a/jambotron-ui/src/app/helpers/auth.interceptor.ts b/jambotron-ui/src/app/helpers/auth.interceptor.ts
index be4ed85..8c1d5cf 100644
--- a/jambotron-ui/src/app/helpers/auth.interceptor.ts
+++ b/jambotron-ui/src/app/helpers/auth.interceptor.ts
@@ -24,9 +24,9 @@ export class AuthInterceptor implements HttpInterceptor {
intercept(req: HttpRequest
, next: HttpHandler): Observable> {
- // req = req.clone({
- // withCredentials: true,
- // });
+ req = req.clone({
+ withCredentials: true,
+ });
return next.handle(req).pipe(
catchError((error) => {
@@ -59,6 +59,7 @@ export class AuthInterceptor implements HttpInterceptor {
if (error.status == '403') {
this.eventBusService.emit(new EventData('logout', null));
+ console.log('eventBusService logout');
}
return throwError(() => error);
diff --git a/jambotron-ui/src/app/models/file-info.ts b/jambotron-ui/src/app/models/file-info.ts
index fc55c33..1cf4a15 100644
--- a/jambotron-ui/src/app/models/file-info.ts
+++ b/jambotron-ui/src/app/models/file-info.ts
@@ -1,4 +1,6 @@
export class FileInfo {
name: string | undefined;
url: string | undefined;
+ mode: string | undefined;//View or CropView
+ base64string: string | undefined;
}
diff --git a/jambotron-ui/src/app/models/role.ts b/jambotron-ui/src/app/models/role.ts
index be13639..685371b 100644
--- a/jambotron-ui/src/app/models/role.ts
+++ b/jambotron-ui/src/app/models/role.ts
@@ -1,4 +1,4 @@
export class Role {
- id?:any;
+ fileName?:any;
name?:string;
}
diff --git a/jambotron-ui/src/app/models/setting.ts b/jambotron-ui/src/app/models/setting.ts
index d26db99..840554a 100644
--- a/jambotron-ui/src/app/models/setting.ts
+++ b/jambotron-ui/src/app/models/setting.ts
@@ -1,5 +1,5 @@
export class Setting {
- id?:any;
+ fileName?:any;
name?:string;
value?:boolean;
}
diff --git a/jambotron-ui/src/app/models/tutorial.model.ts b/jambotron-ui/src/app/models/tutorial.model.ts
index e41afe1..a195d0c 100644
--- a/jambotron-ui/src/app/models/tutorial.model.ts
+++ b/jambotron-ui/src/app/models/tutorial.model.ts
@@ -1,6 +1,6 @@
export class Tutorial {
isSelected?: boolean;
- id?: any;
+ fileName?: any;
title?: string;
description?: string;
published?: boolean;
diff --git a/jambotron-ui/src/app/models/user.model.ts b/jambotron-ui/src/app/models/user.model.ts
index aced2e3..4def107 100644
--- a/jambotron-ui/src/app/models/user.model.ts
+++ b/jambotron-ui/src/app/models/user.model.ts
@@ -1,5 +1,5 @@
export class User {
- id?:any;
+ fileName?:any;
username?:string;
email?:string;
password?:string;
diff --git a/jambotron-ui/src/app/modules/admin-module/admin-module.service.ts b/jambotron-ui/src/app/modules/admin-module/admin-module.service.ts
index ee2b26b..70c8954 100644
--- a/jambotron-ui/src/app/modules/admin-module/admin-module.service.ts
+++ b/jambotron-ui/src/app/modules/admin-module/admin-module.service.ts
@@ -14,7 +14,7 @@ export class AdminModuleService {
}
- updateUserRoles(id: any,data: User): Observable {
- return this.http.put(`${this.baseUrl}/users/${id}`, data);
+ updateUserRoles(fileName: any,data: User): Observable {
+ return this.http.put(`${this.baseUrl}/users/${fileName}`, data);
}
}
diff --git a/jambotron-ui/src/app/modules/admin-module/admin.component/admin.component.ts b/jambotron-ui/src/app/modules/admin-module/admin.component/admin.component.ts
index bd93db9..47cd514 100644
--- a/jambotron-ui/src/app/modules/admin-module/admin.component/admin.component.ts
+++ b/jambotron-ui/src/app/modules/admin-module/admin.component/admin.component.ts
@@ -1,14 +1,11 @@
import {Component, CUSTOM_ELEMENTS_SCHEMA, inject, OnInit} from '@angular/core';
import {Router, RouterOutlet} from "@angular/router";
import {DOCUMENT} from '@angular/common';
-import { ScrollPanelModule } from 'primeng/scrollpanel';
-import {MenuItem} from 'primeng/api';
import {SideBarAdminComponent} from '../side-bar-admin.component/side-bar-admin.component';
@Component({
selector: 'app-admin.component',
imports: [
RouterOutlet,
- ScrollPanelModule,
SideBarAdminComponent
],
schemas:[CUSTOM_ELEMENTS_SCHEMA],
@@ -19,9 +16,7 @@ export class AdminComponent implements OnInit {
private document = inject(DOCUMENT);
height = 0;
- items: MenuItem[] | undefined;
-
- constructor(private router: Router) {
+ constructor(private router: Router) {
this.height = 0
}
@@ -66,30 +61,7 @@ export class AdminComponent implements OnInit {
else
this.height = 0;
- this.items = [
- {
- label: 'Admin',
- icon: 'pi pi-palette',
- command: () => {
- this.router.navigate(['/main/admin/welcome']);
- },
- items: [
- {
- label: 'Settings',
- icon: 'pi pi-eraser',
- // route: '/main/admin/settings'
- command: () => {
- this.router.navigate(['/main/admin/settings']);
- }
- },
- {
- label: 'System',
- icon: 'pi pi-heart',
- route: '/main/admin/system'
- }
- ]
- }
- ];
+
}
}
diff --git a/jambotron-ui/src/app/modules/admin-module/admin.module.ts b/jambotron-ui/src/app/modules/admin-module/admin.module.ts
index 105676b..1b9fc4e 100644
--- a/jambotron-ui/src/app/modules/admin-module/admin.module.ts
+++ b/jambotron-ui/src/app/modules/admin-module/admin.module.ts
@@ -1,15 +1,13 @@
import {CUSTOM_ELEMENTS_SCHEMA, NgModule} from '@angular/core';
-import {mainRouting} from '../main-module/main.routing';
-import {MainComponent} from '../main-module/main.component/main.component';
import {RouterModule} from '@angular/router';
import {AdminComponent} from './admin.component/admin.component';
import {adminRouting} from './admin.routing';
-import { ScrollPanelModule } from 'primeng/scrollpanel';
+
@NgModule({
declarations: [
],
- imports: [adminRouting, AdminComponent,ScrollPanelModule],
+ imports: [adminRouting, AdminComponent],
exports: [RouterModule],
schemas:[CUSTOM_ELEMENTS_SCHEMA]
})
diff --git a/jambotron-ui/src/app/modules/admin-module/users.component/users.component.ts b/jambotron-ui/src/app/modules/admin-module/users.component/users.component.ts
index b7ebcb4..fa747c8 100644
--- a/jambotron-ui/src/app/modules/admin-module/users.component/users.component.ts
+++ b/jambotron-ui/src/app/modules/admin-module/users.component/users.component.ts
@@ -85,7 +85,7 @@ export class UsersComponent {
}
saveUserRoles(user:User){
- this.adminService.updateUserRoles(user.id, user).subscribe(
+ this.adminService.updateUserRoles(user.fileName, user).subscribe(
(data:any) => {
console.log(data);
user.isEdit = false
@@ -98,13 +98,13 @@ export class UsersComponent {
isChecked(element: User, role: Role) {
let userRoles: Role[] = element.roles;
- return element.roles.some((r:Role) => r.id === role.id);
+ return element.roles.some((r:Role) => r.fileName === role.fileName);
}
onValChange(element:User, role: Role) {
let userRoles: Role[] = element.roles;
if (this.isChecked(element, role)) {
- userRoles = userRoles.filter((r:Role) => r.id !== role.id);
+ userRoles = userRoles.filter((r:Role) => r.fileName !== role.fileName);
}else {
userRoles.push(role);
}
diff --git a/jambotron-ui/src/app/modules/ai-module/generate-image.component/generate-image.component.html b/jambotron-ui/src/app/modules/ai-module/generate-image.component/generate-image.component.html
index 1fc5881..babd5c0 100644
--- a/jambotron-ui/src/app/modules/ai-module/generate-image.component/generate-image.component.html
+++ b/jambotron-ui/src/app/modules/ai-module/generate-image.component/generate-image.component.html
@@ -29,9 +29,9 @@
-
+
@if (isLoggedIn) {