-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #86 from Proyecto-integrador-ISPC-2024/development
Fix de estructura de componentes en dashboard
- Loading branch information
Showing
26 changed files
with
691 additions
and
239 deletions.
There are no files selected for viewing
Empty file.
30 changes: 30 additions & 0 deletions
30
frontend/src/app/components/dashboard-table/dashboard-table.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
<table class="table table-striped w-100"> | ||
<thead> | ||
<tr> | ||
<th scope="col">ID</th> | ||
<th scope="col">Nombre</th> | ||
<th scope="col">Precio</th> | ||
<th scope="col">Imagen</th> | ||
</tr> | ||
</thead> | ||
<tbody> | ||
<tr> | ||
<th scope="row">1</th> | ||
<td>Camiseta Argentina 2021</td> | ||
<td>$12345</td> | ||
<td>"Argentina-2021-Primera.webp"</td> | ||
</tr> | ||
<tr> | ||
<th scope="row">1</th> | ||
<td>Camiseta Argentina 2021</td> | ||
<td>$12345</td> | ||
<td>"Argentina-2021-Primera.webp"</td> | ||
</tr> | ||
<tr> | ||
<th scope="row">1</th> | ||
<td>Camiseta Argentina 2021</td> | ||
<td>$12345</td> | ||
<td>"Argentina-2021-Primera.webp"</td> | ||
</tr> | ||
</tbody> | ||
</table> |
23 changes: 23 additions & 0 deletions
23
frontend/src/app/components/dashboard-table/dashboard-table.component.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
import { ComponentFixture, TestBed } from '@angular/core/testing'; | ||
|
||
import { DashboardTableComponent } from './dashboard-table.component'; | ||
|
||
describe('DashboardTableComponent', () => { | ||
let component: DashboardTableComponent; | ||
let fixture: ComponentFixture<DashboardTableComponent>; | ||
|
||
beforeEach(async () => { | ||
await TestBed.configureTestingModule({ | ||
imports: [DashboardTableComponent] | ||
}) | ||
.compileComponents(); | ||
|
||
fixture = TestBed.createComponent(DashboardTableComponent); | ||
component = fixture.componentInstance; | ||
fixture.detectChanges(); | ||
}); | ||
|
||
it('should create', () => { | ||
expect(component).toBeTruthy(); | ||
}); | ||
}); |
12 changes: 12 additions & 0 deletions
12
frontend/src/app/components/dashboard-table/dashboard-table.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
import { Component } from '@angular/core'; | ||
|
||
@Component({ | ||
selector: 'app-dashboard-table', | ||
standalone: true, | ||
imports: [], | ||
templateUrl: './dashboard-table.component.html', | ||
styleUrl: './dashboard-table.component.css' | ||
}) | ||
export class DashboardTableComponent { | ||
|
||
} |
Empty file.
9 changes: 9 additions & 0 deletions
9
frontend/src/app/components/management/management.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
<section class="d-flex flex-column align-items-stretch justify-content-between"> | ||
<article class="mb-5"> | ||
<app-order-management></app-order-management> | ||
</article> | ||
<hr /> | ||
<article> | ||
<app-product-management></app-product-management> | ||
</article> | ||
</section> |
23 changes: 23 additions & 0 deletions
23
frontend/src/app/components/management/management.component.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
import { ComponentFixture, TestBed } from '@angular/core/testing'; | ||
|
||
import { ManagementComponent } from './management.component'; | ||
|
||
describe('ManagementComponent', () => { | ||
let component: ManagementComponent; | ||
let fixture: ComponentFixture<ManagementComponent>; | ||
|
||
beforeEach(async () => { | ||
await TestBed.configureTestingModule({ | ||
imports: [ManagementComponent] | ||
}) | ||
.compileComponents(); | ||
|
||
fixture = TestBed.createComponent(ManagementComponent); | ||
component = fixture.componentInstance; | ||
fixture.detectChanges(); | ||
}); | ||
|
||
it('should create', () => { | ||
expect(component).toBeTruthy(); | ||
}); | ||
}); |
12 changes: 12 additions & 0 deletions
12
frontend/src/app/components/management/management.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
import { Component } from '@angular/core'; | ||
import { ProductManagementComponent } from '../product-management/product-management.component'; | ||
import { OrderManagementComponent } from '../order-management/order-management.component'; | ||
|
||
@Component({ | ||
selector: 'app-management', | ||
standalone: true, | ||
imports: [ProductManagementComponent, OrderManagementComponent], | ||
templateUrl: './management.component.html', | ||
styleUrl: './management.component.css', | ||
}) | ||
export class ManagementComponent {} |
Empty file.
108 changes: 108 additions & 0 deletions
108
frontend/src/app/components/order-management/order-management.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,108 @@ | ||
<section> | ||
<h2 class="my-3">Gestión de pedidos</h2> | ||
<div class="mb-4"> | ||
<form> | ||
<div class="input-group"> | ||
<input | ||
type="text" | ||
class="form-control" | ||
placeholder="Buscar pedido..." | ||
aria-label="Buscar orden" | ||
aria-describedby="button-addon2" | ||
/> | ||
<button class="btn btn-success" type="button" id="button-addon2"> | ||
Buscar | ||
</button> | ||
</div> | ||
</form> | ||
</div> | ||
<div class="card text-center products-summary-card"> | ||
<div class="card-header"> | ||
<ul class="nav nav-tabs card-header-tabs align-items-end"> | ||
<li class="nav-item m-0"> | ||
<a | ||
class="nav-link py-2 px-3 text-center btn-block btn-custom" | ||
href="#" | ||
style="color: #ffffff; background-color: #21ad6c" | ||
>Resumen de pedidos</a | ||
> | ||
</li> | ||
<li class="nav-item m-0"> | ||
<a | ||
class="nav-link py-2 px-3 text-center btn-block btn-custom" | ||
href="#" | ||
style="color: #ffffff; background-color: #166b43" | ||
>Historial de pedidos</a | ||
> | ||
</li> | ||
</ul> | ||
</div> | ||
|
||
<div class="card-body"> | ||
<div | ||
class="card d-flex flex-column justify-content-between align-items-start p-3" | ||
> | ||
<div | ||
class="w-100 d-flex flex-row align-items-center justify-content-start p-2" | ||
> | ||
<h4>Orden N°12345</h4> | ||
</div> | ||
<div | ||
class="w-100 d-flex flex-column flex-md-row flex-wrap align-items-stretch justify-content-between" | ||
> | ||
<div class="border-bottom border-md-end w-100"> | ||
<ul class="list-group list-group-flush"> | ||
<li | ||
class="list-group-item d-flex flex-row align-items-center justify-content-between py-1 my-1" | ||
> | ||
<span>Camiseta Argentina 2022</span> | ||
<span>$12345</span> | ||
</li> | ||
<li | ||
class="list-group-item d-flex flex-row align-items-center justify-content-between py-1 my-1" | ||
> | ||
<span>Camiseta Argentina 2018</span> | ||
<span>$12345</span> | ||
</li> | ||
<li | ||
class="list-group-item d-flex flex-row align-items-center justify-content-between py-1 my-1" | ||
> | ||
<span>Camiseta Argentina 2014</span> | ||
<span>$12345</span> | ||
</li> | ||
</ul> | ||
</div> | ||
<div class="border-md-start w-100 my-3"> | ||
<ul class="list-group list-group-flush"> | ||
<li class="list-group-item m-0"> | ||
<h6 class="text-start my-1 fs-5">Datos de entrega:</h6> | ||
<ul class="list-group list-group-flush"> | ||
<li class="list-group-item my-1"> | ||
<h6>Fecha estimada de entrega:</h6> | ||
<p>A definir | 18/10/1998 | Entregado</p> | ||
</li> | ||
<li class="list-group-item my-1"> | ||
<h6>Estado:</h6> | ||
<p>Pendiente/Enviando/Entregado</p> | ||
</li> | ||
</ul> | ||
</li> | ||
</ul> | ||
</div> | ||
</div> | ||
<div class="w-100"> | ||
<div | ||
class="d-flex flex-row align-items-center justify-content-end p-2" | ||
> | ||
<button type="button" class="btn btn-danger me-2"> | ||
Eliminar Orden | ||
</button> | ||
<!-- <button type="button" class="btn btn-primary btn-custom-green"> | ||
Editar Orden | ||
</button> --> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
</section> |
12 changes: 6 additions & 6 deletions
12
...ummary/products-summary.component.spec.ts → ...gement/order-management.component.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
frontend/src/app/components/order-management/order-management.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
import { Component } from '@angular/core'; | ||
|
||
@Component({ | ||
selector: 'app-order-management', | ||
standalone: true, | ||
imports: [], | ||
templateUrl: './order-management.component.html', | ||
styleUrl: './order-management.component.css' | ||
}) | ||
export class OrderManagementComponent { | ||
|
||
} |
Empty file.
100 changes: 100 additions & 0 deletions
100
frontend/src/app/components/product-management/product-management.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,100 @@ | ||
<section> | ||
<h2 class="my-3">Gestión de productos</h2> | ||
<div class="mb-4"> | ||
<form> | ||
<div class="input-group"> | ||
<input | ||
type="text" | ||
class="form-control" | ||
placeholder="Buscar producto..." | ||
aria-label="Buscar producto" | ||
aria-describedby="button-addon3" | ||
/> | ||
<button class="btn btn-success" type="button" id="button-addon3"> | ||
Buscar | ||
</button> | ||
</div> | ||
</form> | ||
</div> | ||
<div class="card text-center products-summary-card"> | ||
<div class="card-header"> | ||
<ul class="nav nav-tabs card-header-tabs align-items-end"> | ||
<li class="nav-item m-0"> | ||
<a | ||
class="nav-link py-2 px-3 text-center btn-block btn-custom" | ||
href="#" | ||
style="color: #ffffff; background-color: #21ad6c" | ||
>Lista de productos</a | ||
> | ||
</li> | ||
<li class="nav-item m-0"> | ||
<a | ||
class="nav-link py-2 px-3 text-center btn-block btn-custom" | ||
href="#" | ||
style="color: #ffffff; background-color: #166b43" | ||
>Agregar producto</a | ||
> | ||
</li> | ||
</ul> | ||
</div> | ||
|
||
<div class="card-body"> | ||
<div | ||
class="card d-flex flex-column justify-content-between align-items-start p-3" | ||
> | ||
<div | ||
class="card-header w-100 d-flex flex-row align-items-center justify-content-start p-2" | ||
> | ||
<h4>Camisetas de Argentina</h4> | ||
</div> | ||
<div | ||
class="card-body w-100 d-flex flex-column flex-md-row flex-wrap align-items-stretch justify-content-between" | ||
> | ||
<table class="table table-striped"> | ||
<thead> | ||
<tr> | ||
<th scope="col">ID</th> | ||
<th scope="col">Nombre</th> | ||
<th scope="col">Precio</th> | ||
<th scope="col">Imagen</th> | ||
</tr> | ||
</thead> | ||
<tbody> | ||
<tr> | ||
<th scope="row">1</th> | ||
<td>Camiseta Argentina 2021</td> | ||
<td>$12345</td> | ||
<td>"Argentina-2021-Primera.webp"</td> | ||
</tr> | ||
<tr> | ||
<th scope="row">2</th> | ||
<td>Camiseta Argentina 2021</td> | ||
<td>$12345</td> | ||
<td>"Argentina-2021-Primera.webp"</td> | ||
</tr> | ||
<tr> | ||
<th scope="row">3</th> | ||
<td>Camiseta Argentina 2021</td> | ||
<td>$12345</td> | ||
<td>"Argentina-2021-Primera.webp"</td> | ||
</tr> | ||
</tbody> | ||
</table> | ||
</div> | ||
|
||
<div class="card-footer w-100"> | ||
<div | ||
class="d-flex flex-row align-items-center justify-content-end p-2" | ||
> | ||
<button type="button" class="btn btn-danger me-2"> | ||
Eliminar producto | ||
</button> | ||
<button type="button" class="btn btn-warning btn-custom-green"> | ||
Editar producto | ||
</button> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
</section> |
23 changes: 23 additions & 0 deletions
23
frontend/src/app/components/product-management/product-management.component.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
import { ComponentFixture, TestBed } from '@angular/core/testing'; | ||
|
||
import { ProductManagementComponent } from './product-management.component'; | ||
|
||
describe('ProductManagementComponent', () => { | ||
let component: ProductManagementComponent; | ||
let fixture: ComponentFixture<ProductManagementComponent>; | ||
|
||
beforeEach(async () => { | ||
await TestBed.configureTestingModule({ | ||
imports: [ProductManagementComponent] | ||
}) | ||
.compileComponents(); | ||
|
||
fixture = TestBed.createComponent(ProductManagementComponent); | ||
component = fixture.componentInstance; | ||
fixture.detectChanges(); | ||
}); | ||
|
||
it('should create', () => { | ||
expect(component).toBeTruthy(); | ||
}); | ||
}); |
12 changes: 12 additions & 0 deletions
12
frontend/src/app/components/product-management/product-management.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
import { Component } from '@angular/core'; | ||
|
||
@Component({ | ||
selector: 'app-product-management', | ||
standalone: true, | ||
imports: [], | ||
templateUrl: './product-management.component.html', | ||
styleUrl: './product-management.component.css' | ||
}) | ||
export class ProductManagementComponent { | ||
|
||
} |
Oops, something went wrong.