From d58f63d8c6baac0c778a805c7e9f375b0de95320 Mon Sep 17 00:00:00 2001 From: apuente Date: Wed, 29 May 2024 00:38:29 +0200 Subject: [PATCH] Tabla usuarios --- ogWebconsole/src/app/app-routing.module.ts | 6 ++++- ogWebconsole/src/app/app.module.ts | 20 ++++++++++++--- .../layout/header/header.component.css | 1 + .../layout/header/header.component.html | 4 +-- .../main-layout/main-layout.component.css | 1 - .../app/components/login/login.component.ts | 3 +++ .../pages/users/users.component.css | 0 .../pages/users/users.component.html | 1 - .../pages/users/users.component.spec.ts | 23 ------------------ .../components/pages/users/users.component.ts | 10 -------- ogWebconsole/src/favicon.ico | Bin 15086 -> 3518 bytes 11 files changed, 28 insertions(+), 41 deletions(-) delete mode 100644 ogWebconsole/src/app/components/pages/users/users.component.css delete mode 100644 ogWebconsole/src/app/components/pages/users/users.component.html delete mode 100644 ogWebconsole/src/app/components/pages/users/users.component.spec.ts delete mode 100644 ogWebconsole/src/app/components/pages/users/users.component.ts diff --git a/ogWebconsole/src/app/app-routing.module.ts b/ogWebconsole/src/app/app-routing.module.ts index 2f3b35f..dddae8a 100644 --- a/ogWebconsole/src/app/app-routing.module.ts +++ b/ogWebconsole/src/app/app-routing.module.ts @@ -5,7 +5,9 @@ import { AuthLayoutComponent } from './components/layout/auth-layout/auth-layout 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 { UsersComponent } from './components/pages/users/users.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'; const routes: Routes = [ { path: '', redirectTo: 'auth/login', pathMatch: 'full' }, { @@ -13,7 +15,9 @@ const routes: Routes = [ component: MainLayoutComponent, children: [ { path: 'dashboard', component: DashboardComponent }, + { path: 'admin', component: AdminComponent }, { path: 'users', component: UsersComponent }, + { path: 'roles', component: RolesComponent }, // otras rutas que usan el MainLayoutComponent ], }, diff --git a/ogWebconsole/src/app/app.module.ts b/ogWebconsole/src/app/app.module.ts index 696fadc..d4835dc 100644 --- a/ogWebconsole/src/app/app.module.ts +++ b/ogWebconsole/src/app/app.module.ts @@ -16,7 +16,14 @@ 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 { UsersComponent } from './components/pages/users/users.component'; +import { AdminComponent } from './components/pages/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'; @NgModule({ declarations: [ AppComponent, @@ -25,9 +32,10 @@ import { UsersComponent } from './components/pages/users/users.component'; HeaderComponent, SidebarComponent, LoginComponent, - UsersComponent, + AdminComponent, MainLayoutComponent, UsersComponent, + RolesComponent ], bootstrap: [AppComponent], imports: [BrowserModule, AppRoutingModule, @@ -36,7 +44,13 @@ import { UsersComponent } from './components/pages/users/users.component'; MatIconModule, MatButtonModule, MatSidenavModule, - BrowserAnimationsModule], providers: [ + BrowserAnimationsModule, + MatCardModule, + MatCheckboxModule, + MatFormFieldModule, + MatInputModule, + MatListModule], + providers: [ { provide: HTTP_INTERCEPTORS, useClass: CustomInterceptor, diff --git a/ogWebconsole/src/app/components/layout/header/header.component.css b/ogWebconsole/src/app/components/layout/header/header.component.css index 079a003..4c1caaf 100644 --- a/ogWebconsole/src/app/components/layout/header/header.component.css +++ b/ogWebconsole/src/app/components/layout/header/header.component.css @@ -22,4 +22,5 @@ button[mat-flat-button] { .navbar-tittle{ padding-left: 20px; + cursor: pointer; } \ No newline at end of file diff --git a/ogWebconsole/src/app/components/layout/header/header.component.html b/ogWebconsole/src/app/components/layout/header/header.component.html index 0919b01..7937a60 100644 --- a/ogWebconsole/src/app/components/layout/header/header.component.html +++ b/ogWebconsole/src/app/components/layout/header/header.component.html @@ -2,7 +2,7 @@ - Opengnsys webconsole + Opengnsys webconsole
@@ -12,8 +12,8 @@ - +
diff --git a/ogWebconsole/src/app/components/layout/main-layout/main-layout.component.css b/ogWebconsole/src/app/components/layout/main-layout/main-layout.component.css index 8f07c83..e61afc7 100644 --- a/ogWebconsole/src/app/components/layout/main-layout/main-layout.component.css +++ b/ogWebconsole/src/app/components/layout/main-layout/main-layout.component.css @@ -8,6 +8,5 @@ } .content-wrapper{ display: block; - background-color: gold; grid-area: content; } \ No newline at end of file diff --git a/ogWebconsole/src/app/components/login/login.component.ts b/ogWebconsole/src/app/components/login/login.component.ts index 36a9806..d0ebd22 100644 --- a/ogWebconsole/src/app/components/login/login.component.ts +++ b/ogWebconsole/src/app/components/login/login.component.ts @@ -45,6 +45,9 @@ export class LoginComponent { 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'); } } }); diff --git a/ogWebconsole/src/app/components/pages/users/users.component.css b/ogWebconsole/src/app/components/pages/users/users.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/ogWebconsole/src/app/components/pages/users/users.component.html b/ogWebconsole/src/app/components/pages/users/users.component.html deleted file mode 100644 index 065c5c6..0000000 --- a/ogWebconsole/src/app/components/pages/users/users.component.html +++ /dev/null @@ -1 +0,0 @@ -

users works!

diff --git a/ogWebconsole/src/app/components/pages/users/users.component.spec.ts b/ogWebconsole/src/app/components/pages/users/users.component.spec.ts deleted file mode 100644 index f30ed79..0000000 --- a/ogWebconsole/src/app/components/pages/users/users.component.spec.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { UsersComponent } from './users.component'; - -describe('UsersComponent', () => { - let component: UsersComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [UsersComponent] - }) - .compileComponents(); - - fixture = TestBed.createComponent(UsersComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/ogWebconsole/src/app/components/pages/users/users.component.ts b/ogWebconsole/src/app/components/pages/users/users.component.ts deleted file mode 100644 index ece578f..0000000 --- a/ogWebconsole/src/app/components/pages/users/users.component.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-users', - templateUrl: './users.component.html', - styleUrl: './users.component.css' -}) -export class UsersComponent { - -} diff --git a/ogWebconsole/src/favicon.ico b/ogWebconsole/src/favicon.ico index 57614f9c967596fad0a3989bec2b1deff33034f6..32c8b450ce00453b32b10bf820ecd973f894d2d2 100644 GIT binary patch literal 3518 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 Nr__JTFzvMr^FKp4S3v*(