Skip to content

Commit 5d130f7

Browse files
gnllucenagnllucena
committed
Filter e List desenhados.
1 parent bee004c commit 5d130f7

19 files changed

+169
-747
lines changed

‎src/app/modules/ui/breadcrumb.component.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Component } from '@angular/core';
33
@Component({
44
selector: 'app-breadcrumb',
55
template: `
6-
<div class="row">
6+
<div class="row mb-2">
77
<div class="col-12">
88
<div class="page-title-box">
99
<div class="page-title-right">
@@ -13,7 +13,6 @@ import { Component } from '@angular/core';
1313
<li class="breadcrumb-item active">Form Elements</li>
1414
</ol>
1515
</div>
16-
<h4 class="page-title">Form Elements</h4>
1716
</div>
1817
</div>
1918
</div>

‎src/app/modules/ui/header.component.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@ import { Jwt } from '../../domain/jwt';
1212
1313
<div id="navbarNavDropdown" class="navbar-collapse collapse">
1414
<ul class="navbar-nav mr-auto">
15-
<ng-container *ngIf="!logged">
16-
<a class="nav-item nav-link" routerLink="/identity" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}">Log In</a>
17-
</ng-container>
1815
<ng-container *ngIf="logged">
1916
<a class="nav-item nav-link" routerLink="/dot/{{ username }}" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}">~/{{ username }}</a>
17+
<a class="nav-item nav-link" routerLink="/dot/{{ username }}/users" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}">users</a>
2018
</ng-container>
2119
</ul>
2220
<ul class="navbar-nav">
21+
<ng-container *ngIf="!logged">
22+
<a class="nav-item nav-link" routerLink="/identity" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}">Log In</a>
23+
</ng-container>
2324
<ng-container *ngIf="logged">
2425
<a class="nav-item nav-link" (click)="logout()" href="javascript:void(0)">Log Off</a>
2526
</ng-container>

‎src/app/routes/dot/dot.module.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import { UIModule } from '../../modules/ui/.ui.module';
44

55
export const appRoutes: Routes = [
66
{
7-
path: '',
8-
loadChildren: './mine/dot-mine.module#DotMineModule'
7+
path: ':username/users',
8+
loadChildren: './users/dot-users.module#DotUsersModule'
99
},
1010
{
1111
path: ':username',
1212
loadChildren: './myself/dot-myself.module#DotMyselfModule'
13-
},
13+
}
1414
];
1515

1616
// users-add -> users.form

‎src/app/routes/dot/mine/dot-mine.module.ts

-35
This file was deleted.

‎src/app/routes/dot/mine/mine-filter/dot-mine-filter.component.html

-679
This file was deleted.

‎src/app/routes/dot/mine/mine-list/dot-mine-list.component.html

-1
This file was deleted.

‎src/app/routes/dot/users/dot-users.module.ts

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
2+
import { NgModule } from '@angular/core';
3+
import { RouterModule, Routes } from '@angular/router';
4+
5+
import { UIModule } from '../../../modules/ui/.ui.module';
6+
7+
import { AuthenticationGuard } from '../../../modules/core/authentication.guard';
8+
9+
import { DotUsersPageComponent } from './users-page/dot-users-page.component';
10+
import { DotUsersListComponent } from './users-list/dot-users-list.component';
11+
import { DotUsersFormComponent } from './users-form/dot-users-form.component';
12+
import { DotUsersFilterComponent } from './users-filter/dot-users-filter.component';
13+
import { DotUsersEditComponent } from './users-edit/dot-users-edit.component';
14+
import { DotUsersAddComponent } from './users-add/dot-users-add.component';
15+
16+
17+
const appRoutes: Routes = [
18+
{ path: '', component: DotUsersPageComponent, canActivate: [AuthenticationGuard] },
19+
];
20+
21+
@NgModule({
22+
declarations: [
23+
DotUsersPageComponent,
24+
DotUsersListComponent,
25+
DotUsersFormComponent,
26+
DotUsersFilterComponent,
27+
DotUsersEditComponent,
28+
DotUsersAddComponent
29+
],
30+
imports: [
31+
UIModule,
32+
RouterModule.forChild(appRoutes)
33+
]
34+
})
35+
export class DotUsersModule { }

‎src/app/routes/dot/mine/mine-add/dot-mine-add.component.html renamed to ‎src/app/routes/dot/users/users-add/dot-users-add.component.html

File renamed without changes.

‎src/app/routes/dot/mine/mine-add/dot-mine-add.component.ts renamed to ‎src/app/routes/dot/users/users-add/dot-users-add.component.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { Component, ViewEncapsulation } from '@angular/core';
22

33
@Component({
4-
selector: 'dot-mine-add',
5-
templateUrl: './dot-mine-add.component.html',
4+
selector: 'dot-users-add',
5+
templateUrl: './dot-users-add.component.html',
66
encapsulation: ViewEncapsulation.None
77
})
8-
export class DotMineAddComponent {
8+
export class DotUsersAddComponent {
99
title = 'Add';
1010

1111
constructor() { }

‎src/app/routes/dot/mine/mine-edit/dot-mine-edit.component.html renamed to ‎src/app/routes/dot/users/users-edit/dot-users-edit.component.html

File renamed without changes.

‎src/app/routes/dot/mine/mine-edit/dot-mine-edit.component.ts renamed to ‎src/app/routes/dot/users/users-edit/dot-users-edit.component.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { Component, ViewEncapsulation } from '@angular/core';
22

33
@Component({
4-
selector: 'dot-mine-edit',
5-
templateUrl: './dot-mine-edit.component.html',
4+
selector: 'dot-users-edit',
5+
templateUrl: './dot-users-edit.component.html',
66
encapsulation: ViewEncapsulation.None
77
})
8-
export class DotMineEditComponent {
8+
export class DotUsersEditComponent {
99
title = 'Edit';
1010

1111
constructor() { }

‎src/app/routes/dot/users/users-filter/dot-users-filter.component.html

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<div class="row mb-2 mb-2">
2+
<div class="col-lg-12">
3+
<div class="card">
4+
<div class="card-body">
5+
<h4 class="header-title mb-3">Search for mine:</h4>
6+
<form class="needs-validation was-validated" novalidate="">
7+
<div class="form-row">
8+
<div class="form-group col-md-3">
9+
<label for="validationCustom02">Last name</label>
10+
<input type="text" class="form-control" id="validationCustom02" placeholder="Last name" value="Otto" required="">
11+
<div class="valid-feedback">
12+
Looks good!
13+
</div>
14+
</div>
15+
<div class="form-group col-md-3">
16+
<label for="validationCustom02">Last name</label>
17+
<input type="text" class="form-control" id="validationCustom02" placeholder="Last name" value="Otto" required="">
18+
<div class="valid-feedback">
19+
Looks good!
20+
</div>
21+
</div>
22+
<div class="form-group col-md-6">
23+
<label for="validationCustom02">Last name</label>
24+
<input type="text" class="form-control" id="validationCustom02" placeholder="Last name" value="Otto" required="">
25+
<div class="valid-feedback">
26+
Looks good!
27+
</div>
28+
</div>
29+
</div>
30+
<button class="btn btn-primary" type="submit">Search!</button>
31+
</form>
32+
</div>
33+
</div>
34+
</div>
35+
</div>

‎src/app/routes/dot/mine/mine-filter/dot-mine-filter.component.ts renamed to ‎src/app/routes/dot/users/users-filter/dot-users-filter.component.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { Component, ViewEncapsulation } from '@angular/core';
22

33
@Component({
4-
selector: 'dot-mine-filter',
5-
templateUrl: './dot-mine-filter.component.html',
4+
selector: 'dot-users-filter',
5+
templateUrl: './dot-users-filter.component.html',
66
encapsulation: ViewEncapsulation.None
77
})
88

9-
export class DotMineFilterComponent {
9+
export class DotUsersFilterComponent {
1010
constructor() { }
1111
}

‎src/app/routes/dot/mine/mine-form/dot-mine-form.component.html renamed to ‎src/app/routes/dot/users/users-form/dot-users-form.component.html

File renamed without changes.

‎src/app/routes/dot/mine/mine-list/dot-mine-list.component.ts renamed to ‎src/app/routes/dot/users/users-form/dot-users-form.component.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { Component, ViewEncapsulation } from '@angular/core';
22

33
@Component({
4-
selector: 'dot-mine-list',
5-
templateUrl: './dot-mine-list.component.html',
4+
selector: 'dot-users-form',
5+
templateUrl: './dot-users-form.component.html',
66
encapsulation: ViewEncapsulation.None
77
})
88

9-
export class DotMineListComponent {
9+
export class DotUsersFormComponent {
1010
constructor() { }
1111
}

‎src/app/routes/dot/users/users-list/dot-users-list.component.html

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<div class="row">
2+
<div class="col-xl-12">
3+
<div class="card">
4+
<div class="card-body">
5+
<div class="table-responsive-sm">
6+
<table class="table table-striped table-centered mb-0">
7+
<thead>
8+
<tr>
9+
<th>User</th>
10+
<th>Account No.</th>
11+
<th>Balance</th>
12+
<th></th>
13+
</tr>
14+
</thead>
15+
<tbody>
16+
<tr>
17+
<td class="table-user">
18+
Risa D. Pearson
19+
</td>
20+
<td>AC336 508 2157</td>
21+
<td>July 24, 1950</td>
22+
<td class="table-action">
23+
<a href="javascript: void(0);" class="action-icon"> <i class="mdi mdi-pencil"></i></a>
24+
<a href="javascript: void(0);" class="action-icon"> <i class="mdi mdi-delete"></i></a>
25+
</td>
26+
</tr>
27+
<tr>
28+
<td class="table-user">
29+
Ann C. Thompson
30+
</td>
31+
<td>SB646 473 2057</td>
32+
<td>January 25, 1959</td>
33+
<td class="table-action">
34+
<a href="javascript: void(0);" class="action-icon"> <i class="mdi mdi-pencil"></i></a>
35+
<a href="javascript: void(0);" class="action-icon"> <i class="mdi mdi-delete"></i></a>
36+
</td>
37+
</tr>
38+
<tr>
39+
<td class="table-user">
40+
Paul J. Friend
41+
</td>
42+
<td>DL281 308 0793</td>
43+
<td>September 1, 1939</td>
44+
<td class="table-action">
45+
<a href="javascript: void(0);" class="action-icon"> <i class="mdi mdi-pencil"></i></a>
46+
<a href="javascript: void(0);" class="action-icon"> <i class="mdi mdi-delete"></i></a>
47+
</td>
48+
</tr>
49+
<tr>
50+
<td class="table-user">
51+
Sean C. Nguyen
52+
</td>
53+
<td>CA269 714 6825</td>
54+
<td>February 5, 1994</td>
55+
<td class="table-action">
56+
<a href="javascript: void(0);" class="action-icon"> <i class="mdi mdi-pencil"></i></a>
57+
<a href="javascript: void(0);" class="action-icon"> <i class="mdi mdi-delete"></i></a>
58+
</td>
59+
</tr>
60+
</tbody>
61+
</table>
62+
</div> <!-- end table-responsive-->
63+
64+
</div> <!-- end card body-->
65+
</div> <!-- end card -->
66+
</div><!-- end col-->
67+
</div>

‎src/app/routes/dot/mine/mine-form/dot-mine-form.component.ts renamed to ‎src/app/routes/dot/users/users-list/dot-users-list.component.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { Component, ViewEncapsulation } from '@angular/core';
22

33
@Component({
4-
selector: 'dot-mine-form',
5-
templateUrl: './dot-mine-form.component.html',
4+
selector: 'dot-users-list',
5+
templateUrl: './dot-users-list.component.html',
66
encapsulation: ViewEncapsulation.None
77
})
88

9-
export class DotMineFormComponent {
9+
export class DotUsersListComponent {
1010
constructor() { }
1111
}

‎src/app/routes/dot/mine/mine-page/dot-mine-page.component.html renamed to ‎src/app/routes/dot/users/users-page/dot-users-page.component.html

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
<app-header></app-header>
22

3-
<app-breadcrumb></app-breadcrumb>
4-
53
<div class="container">
6-
<dot-mine-filter></dot-mine-filter>
4+
<app-breadcrumb></app-breadcrumb>
5+
6+
<dot-users-filter></dot-users-filter>
77
<!-- (onUpdateFilters)="updateFilters($event)"> -->
88

9-
<dot-mine-list></dot-mine-list>
9+
<dot-users-list></dot-users-list>
1010
<!-- #listCanal
1111
(editEvent)="openEditPanel($event)"
1212
(exportList)="applyExportList($event)"> -->
1313

14-
<dot-mine-add></dot-mine-add>
14+
<dot-users-add></dot-users-add>
1515
<!-- *ngIf="adding"
1616
#canalAdd
1717
(returnSave)="added()"
1818
(closeModal)="closeModal()"> -->
1919

20-
<dot-mine-edit></dot-mine-edit>
20+
<dot-users-edit></dot-users-edit>
2121
<!-- *ngIf="editing"
2222
#canalEdit
2323
[element]="editingElement"

‎src/app/routes/dot/mine/mine-page/dot-mine-page.component.ts renamed to ‎src/app/routes/dot/users/users-page/dot-users-page.component.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ import { AuthenticationService } from '../../../../services/authentication.servi
33
import { Jwt } from '../../../../domain/jwt';
44

55
@Component({
6-
selector: 'dot-mine-page',
7-
templateUrl: './dot-mine-page.component.html',
6+
selector: 'dot-users-page',
7+
templateUrl: './dot-users-page.component.html',
88
encapsulation: ViewEncapsulation.None
99
})
1010

11-
export class DotMinePageComponent {
11+
export class DotUsersPageComponent {
1212
title = '';
1313

1414
constructor(private authenticationService: AuthenticationService) {

0 commit comments

Comments
 (0)