-
-
+
+
+
+
+
+
-
\ No newline at end of file
+
+
diff --git a/ogWebconsole/src/app/components/layout/main-layout/main-layout.component.ts b/ogWebconsole/src/app/components/layout/main-layout/main-layout.component.ts
index 1365866..8017e31 100644
--- a/ogWebconsole/src/app/components/layout/main-layout/main-layout.component.ts
+++ b/ogWebconsole/src/app/components/layout/main-layout/main-layout.component.ts
@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
@Component({
selector: 'app-main-layout',
templateUrl: './main-layout.component.html',
- styleUrl: './main-layout.component.css'
+ styleUrl: './main-layout.component.css',
})
export class MainLayoutComponent {
isSidebarVisible: boolean = false;
diff --git a/ogWebconsole/src/app/components/layout/sidebar/sidebar.component.css b/ogWebconsole/src/app/components/layout/sidebar/sidebar.component.css
index 081d0e5..a58bde4 100644
--- a/ogWebconsole/src/app/components/layout/sidebar/sidebar.component.css
+++ b/ogWebconsole/src/app/components/layout/sidebar/sidebar.component.css
@@ -1,24 +1,39 @@
-.sidebar {
- width: 250px;
- position: fixed;
- top: 50px;
- left: -260px;
- height: 100%;
- background-color: rgb(245, 245, 245);
- transition: left 0.3s ease-in-out;
- box-shadow: 10px 0 10px -5px rgba(0, 0, 0, 0.5);
- }
-
- .sidebar.visible {
- left: 0;
- }
-
- .sidebar-content{
- margin: 20px;
- }
-
- button {
- margin-bottom: 10px;
+mat-nav-list {
+ width: 250px;
+}
+
+mat-list-item {
+ cursor: pointer;
+ display: flex;
+ align-items: center;
+}
+
+.entry{
+ display: flex;
+ align-items: center;
+ gap: 1rem;
+ padding:0.75rem;
+}
+
+mat-icon {
+ margin-right: 8px;
+}
+
+.user-logged{
+ align-items: center;
+ height: 70px;
+ gap: 2rem;
+ padding:1rem;
+ font-size: medium;
+}
+
+.sidebar-content {
+ display: flex;
+ flex-direction: column;
+ height: 100%;
+}
+
+.admin-link {
+ margin-top: auto;
}
-
diff --git a/ogWebconsole/src/app/components/layout/sidebar/sidebar.component.html b/ogWebconsole/src/app/components/layout/sidebar/sidebar.component.html
index a4a5b88..b3658ea 100644
--- a/ogWebconsole/src/app/components/layout/sidebar/sidebar.component.html
+++ b/ogWebconsole/src/app/components/layout/sidebar/sidebar.component.html
@@ -1,8 +1,58 @@
-
-
\ No newline at end of file
+
+
+
+ Bienvenido {{username}}
+
+
+
+
+
+
+
+ apartment
+ Grupos
+
+
+
+
+ chevron_right
+ Acciones
+
+
+
+
+ desktop_windows
+ Imágenes
+
+
+
+
+ settings_input_component
+ Componentes
+
+
+
+
+ warehouse
+ Repositorios
+
+
+
+
+ list
+ Menús
+
+
+
+
+ search
+ Buscar
+
+
+
+
+ calendar_month
+ Calendarios
+
+
+
diff --git a/ogWebconsole/src/app/components/layout/sidebar/sidebar.component.spec.ts b/ogWebconsole/src/app/components/layout/sidebar/sidebar.component.spec.ts
index 85e49bd..5445f3c 100644
--- a/ogWebconsole/src/app/components/layout/sidebar/sidebar.component.spec.ts
+++ b/ogWebconsole/src/app/components/layout/sidebar/sidebar.component.spec.ts
@@ -11,7 +11,7 @@ describe('SidebarComponent', () => {
imports: [SidebarComponent]
})
.compileComponents();
-
+
fixture = TestBed.createComponent(SidebarComponent);
component = fixture.componentInstance;
fixture.detectChanges();
diff --git a/ogWebconsole/src/app/components/layout/sidebar/sidebar.component.ts b/ogWebconsole/src/app/components/layout/sidebar/sidebar.component.ts
index 89f5112..a93961e 100644
--- a/ogWebconsole/src/app/components/layout/sidebar/sidebar.component.ts
+++ b/ogWebconsole/src/app/components/layout/sidebar/sidebar.component.ts
@@ -21,22 +21,13 @@ export class SidebarComponent {
if (token) {
try {
this.decodedToken = jwtDecode(token);
- console.log('Decoded token:', this.decodedToken);
this.isSuperAdmin = this.decodedToken.roles.includes('ROLE_SUPER_ADMIN');
+ localStorage.setItem('isSuperAdmin', String(this.isSuperAdmin));
+ console.log('isSuperAdmin:', this.isSuperAdmin);
this.username = this.decodedToken.username;
} catch (error) {
console.error('Error decoding JWT:', error);
}
}
}
-
- editUser(user: any) {
- // Implementar la lógica de edición
- const dialogRef = this.dialog.open(ChangePasswordModalComponent, {
- data: { user: this.decodedToken.username, uuid: this.decodedToken.uuid },
- });
- /* dialogRef.componentInstance.userEdited.subscribe(() => {
- console.log("User edited successfully!")
- }); */
- }
-}
\ No newline at end of file
+}
diff --git a/ogWebconsole/src/app/components/login/login.component.css b/ogWebconsole/src/app/components/login/login.component.css
index 36514b6..8c76e94 100644
--- a/ogWebconsole/src/app/components/login/login.component.css
+++ b/ogWebconsole/src/app/components/login/login.component.css
@@ -1,16 +1,17 @@
.login {
overflow: hidden;
- background-color: rgb(255, 255, 255);
- border: 1px solid grey;
- padding: 40px 30px 30px 30px;
+ background-color: #fff;
+ border: 1px solid rgba(128, 128, 128, 0.801);
+ padding: 40px 30px;
border-radius: 10px;
position: absolute;
top: 50%;
left: 50%;
- width: 400px;
+ width: 300px;
transform: translate(-50%, -50%);
transition: transform 300ms, box-shadow 300ms;
box-shadow: 5px 10px 10px rgba(2, 128, 144, 0.2);
+ text-align: center;
}
.login::before, .login::after {
@@ -18,42 +19,30 @@
position: absolute;
width: 600px;
height: 600px;
- border-top-left-radius: 40%;
- border-top-right-radius: 45%;
- border-bottom-left-radius: 35%;
- border-bottom-right-radius: 40%;
+ border-radius: 40% 45% 35% 40%;
z-index: -1;
}
-.login input {
- font-family: "Asap", sans-serif;
+.login-logo {
+ height: 100px;
+ width: 100px;
display: block;
- border-radius: 5px;
- font-size: 16px;
- background: rgba(230, 230, 230);
+ margin: 0 auto 20px;
+}
+
+.button-row {
+ display: flex;
+ justify-content: center;
+ width: 100%;
+ margin-top: 20px;
+}
+
+.button-row button {
+ width: 100%;
+}
+
+mat-form-field {
width: 100%;
- padding: 10px 10px;
- margin: 15px -10px;
-}
-
-.login button {
- font-family: "Asap", sans-serif;
- cursor: pointer;
- color: #fff;
- font-size: 16px;
- text-transform: uppercase;
- width: 80px;
- border: 0;
- padding: 10px 0;
- margin-top: 10px;
- margin-left: -5px;
- border-radius: 5px;
- background-color: #0084ff;
- transition: background-color 300ms;
-}
-
-.login button:hover {
- background-color: #0271da;
}
.invalid {
@@ -64,3 +53,16 @@
color: red;
margin-top: 10px;
}
+
+@keyframes rotate360 {
+ from {
+ transform: rotate(0deg);
+ }
+ to {
+ transform: rotate(360deg);
+ }
+}
+
+.rotating {
+ animation: rotate360 0.6s cubic-bezier(.42,0,1,1) infinite;
+}
diff --git a/ogWebconsole/src/app/components/login/login.component.html b/ogWebconsole/src/app/components/login/login.component.html
index 02cfc41..abb8dad 100644
--- a/ogWebconsole/src/app/components/login/login.component.html
+++ b/ogWebconsole/src/app/components/login/login.component.html
@@ -1,9 +1,27 @@
diff --git a/ogWebconsole/src/app/components/login/login.component.ts b/ogWebconsole/src/app/components/login/login.component.ts
index 74b4fd9..3b6f805 100644
--- a/ogWebconsole/src/app/components/login/login.component.ts
+++ b/ogWebconsole/src/app/components/login/login.component.ts
@@ -1,6 +1,7 @@
import { HttpClient } from '@angular/common/http';
-import { Component } from '@angular/core';
+import {Component, signal} from '@angular/core';
import { Router } from '@angular/router';
+import {ToastrService} from "ngx-toastr";
@Component({
selector: 'app-login',
@@ -13,10 +14,18 @@ export class LoginComponent {
"password": ""
};
errorMessage: string = '';
+ isLoading: boolean = false;
+
+ constructor(
+ private http: HttpClient,
+ private router: Router,
+ private toastService: ToastrService,
+ ) { }
- constructor(private http: HttpClient, private router: Router) { }
-
onLogin() {
+ this.errorMessage = '';
+ this.isLoading = true;
+
if (!this.loginObj.username || !this.loginObj.password) {
if (!this.loginObj.username) {
document.getElementById('username')?.classList.add('invalid');
@@ -29,6 +38,8 @@ export class LoginComponent {
} else {
document.getElementById('password')?.classList.remove('invalid');
}
+
+ this.isLoading = false;
return;
}
@@ -38,19 +49,29 @@ export class LoginComponent {
localStorage.setItem('loginToken', res.token);
localStorage.setItem('refreshToken', res.refreshToken);
localStorage.setItem('username', this.loginObj.username);
+ this.openSnackBar(false, 'Bienvenido ' + this.loginObj.username);
this.router.navigateByUrl('/dashboard');
}
+ this.isLoading = false;
},
error: (err) => {
- if (err.status === 401) {
- this.errorMessage = 'Usuario o contraseña incorrectos';
- } else {
- this.errorMessage = 'Ha ocurrido un error. Por favor, inténtelo de nuevo.';
-
- //BYPASS TO DASHBOARD
- /* this.router.navigateByUrl('/dashboard'); */
- }
+ this.isLoading = false;
+ this.openSnackBar(true, 'Error al iniciar sesion: ' + err.error.message);
}
});
}
+
+ hide = signal(true);
+ clickEvent(event: MouseEvent) {
+ event.preventDefault();
+ this.hide.set(!this.hide());
+ event.stopPropagation();
+ }
+
+ openSnackBar(isError: boolean, message: string) {
+ if (isError) {
+ this.toastService.error(message, 'Error');
+ } else
+ this.toastService.success(message, 'Éxito');
+ }
}
diff --git a/ogWebconsole/src/app/components/pages/admin/admin.component.ts b/ogWebconsole/src/app/components/pages/admin/admin.component.ts
index ec768d6..c8de9ee 100644
--- a/ogWebconsole/src/app/components/pages/admin/admin.component.ts
+++ b/ogWebconsole/src/app/components/pages/admin/admin.component.ts
@@ -6,5 +6,8 @@ import { Component } from '@angular/core';
styleUrl: './admin.component.css'
})
export class AdminComponent {
-
+
+}
+
+export class UsersComponent {
}
diff --git a/ogWebconsole/src/app/components/pages/admin/roles/roles/roles.component.css b/ogWebconsole/src/app/components/pages/admin/roles/roles/roles.component.css
index ef18a39..5c924e8 100644
--- a/ogWebconsole/src/app/components/pages/admin/roles/roles/roles.component.css
+++ b/ogWebconsole/src/app/components/pages/admin/roles/roles/roles.component.css
@@ -14,3 +14,8 @@ table {
.header-container h1 {
margin: 0;
}
+
+.mat-elevation-z8 {
+ box-shadow: 0px 0px 0px rgba(0,0,0,0.2);
+}
+
diff --git a/ogWebconsole/src/app/components/pages/admin/roles/roles/roles.component.html b/ogWebconsole/src/app/components/pages/admin/roles/roles/roles.component.html
index 3247992..bd5223b 100644
--- a/ogWebconsole/src/app/components/pages/admin/roles/roles/roles.component.html
+++ b/ogWebconsole/src/app/components/pages/admin/roles/roles/roles.component.html
@@ -2,7 +2,7 @@
Gestión de roles
+ 
+