Skip to content

Commit 04d28fd

Browse files
author
Quique Fernandez
committed
Add header component
1 parent 61b9c59 commit 04d28fd

13 files changed

Lines changed: 52 additions & 46 deletions

File tree

src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.component.html

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<div class="esh-basket">
2-
<div class="esh-basket-header">
3-
<div class="container">
4-
<a class="esh-basket-back" routerLink="/catalog">Back to catalog</a>
5-
</div>
6-
</div>
2+
<esh-header url="/catalog">Back to catalog</esh-header>
73

84
<div class="container">
95
<article class="esh-basket-titles row">

src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import { BrowserModule } from '@angular/platform-browser';
44
import { SharedModule } from '../shared/shared.module';
55
import { BasketComponent } from './basket.component';
66
import { BasketStatusComponent } from './basket-status/basket-status.component';
7-
//import { routing } from './basket.routes';
87
import { BasketService } from './basket.service';
8+
import { Header } from '../shared/components/header/header';
99

1010
@NgModule({
1111
imports: [SharedModule],

src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.component.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ export class CatalogComponent implements OnInit {
5757
getCatalog(pageSize:number, pageIndex: number, brand?: number, type?: number) {
5858
this.service.getCatalog(pageIndex, pageSize, brand, type).subscribe(catalog => {
5959
this.catalog = catalog;
60-
//console.log('catalog items retrieved: ' + catalog.count);
6160

6261
this.paginationInfo = {
6362
actualPage : catalog.pageIndex,
@@ -67,7 +66,6 @@ export class CatalogComponent implements OnInit {
6766
items: catalog.pageSize
6867
};
6968

70-
//console.log(this.paginationInfo);
7169
});
7270
}
7371

@@ -76,7 +74,6 @@ export class CatalogComponent implements OnInit {
7674
this.types = types;
7775
let alltypes = { id: null, type: 'All' };
7876
this.types.unshift(alltypes);
79-
//console.log('types retrieved: ' + types.length);
8077
});
8178
}
8279

@@ -85,7 +82,6 @@ export class CatalogComponent implements OnInit {
8582
this.brands = brands;
8683
let allBrands = { id: null, brand: 'All' };
8784
this.brands.unshift(allBrands);
88-
//console.log('brands retrieved: ' + brands.length);
8985
});
9086
}
9187
}

src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.module.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { BrowserModule } from '@angular/platform-browser';
33

44
import { SharedModule } from '../shared/shared.module';
55
import { CatalogComponent } from './catalog.component';
6-
//import { routing } from './catalog.routes';
76
import { CatalogService } from './catalog.service';
87
import { Pager } from '../shared/components/pager/pager';
98

src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-detail/orders-detail.component.html

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<div class="esh-orders_detail">
2-
<div class="esh-orders_detail-header">
3-
<div class="container">
4-
<a class="esh-orders_detail-back" routerLink="/orders">Back to list</a>
5-
</div>
6-
</div>
2+
<esh-header url="/orders">Back to list</esh-header>
73

84
<div class="container">
95
<section class="esh-orders_detail-section">

src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-detail/orders-detail.component.scss

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,6 @@
33
.esh-orders_detail {
44
min-height: 80vh;
55

6-
$header-height: 4rem;
7-
&-header {
8-
background-color: #00A69C;
9-
height: $header-height;
10-
}
11-
12-
&-back {
13-
color: rgba($color-foreground-brighter, .4);
14-
line-height: $header-height;
15-
text-transform: uppercase;
16-
text-decoration: none;
17-
transition: color $animation-speed-default;
18-
19-
&:hover {
20-
color: $color-foreground-brighter;
21-
transition: color $animation-speed-default;
22-
}
23-
}
24-
256
&-section {
267
padding: 1rem 0;
278

src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders.component.html

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<div class="esh-orders">
2-
<div class="esh-orders-header">
3-
<div class="container">
4-
<a class="esh-orders-back" routerLink="/catalog">Back to catalog</a>
5-
</div>
6-
</div>
2+
<esh-header url="/catalog">Back to catalog</esh-header>
73

84
<div class="container">
95
<article class="esh-orders-titles row">

src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { OrdersComponent } from './orders.component';
66
import { OrdersDetailComponent } from './orders-detail/orders-detail.component';
77
import { OrdersNewComponent } from './orders-new/orders-new.component';
88
import { OrdersService } from './orders.service';
9-
import { Pager } from '../shared/components/pager/pager';
9+
import { Header } from '../shared/components/header/header';
1010

1111
@NgModule({
1212
imports: [BrowserModule, SharedModule],
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<div class="esh-header">
2+
<div class="container">
3+
<a class="esh-header-back" routerLink="{{url}}">
4+
<ng-content></ng-content>
5+
</a>
6+
</div>
7+
</div>
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
@import "../../../variables";
2+
3+
.esh-header {
4+
$header-height: 4rem;
5+
6+
background-color: $color-brand;
7+
height: $header-height;
8+
9+
&-back {
10+
color: rgba($color-foreground-brighter, .4);
11+
line-height: $header-height;
12+
text-transform: uppercase;
13+
text-decoration: none;
14+
transition: color $animation-speed-default;
15+
16+
&:hover {
17+
color: $color-foreground-brighter;
18+
transition: color $animation-speed-default;
19+
}
20+
}
21+
}

0 commit comments

Comments
 (0)