From 95aa84413e4fc764dc3c1d7d68dd32bff7c4e4c0 Mon Sep 17 00:00:00 2001 From: Karoliina Date: Fri, 4 Sep 2020 20:10:12 +0300 Subject: [PATCH] Grid optimizations (#88) --- .../block-grid/block-grid.component.html | 3 +- .../block-grid/block-grid.component.scss | 1 - .../block-grid/block-grid.component.ts | 12 +++++ src/app/content.resolve.ts | 13 ++++++ src/index.html | 45 +++++++++---------- 5 files changed, 48 insertions(+), 26 deletions(-) diff --git a/src/app/content-blocks/block-grid/block-grid.component.html b/src/app/content-blocks/block-grid/block-grid.component.html index e1f3bc54..f1ea1d1e 100644 --- a/src/app/content-blocks/block-grid/block-grid.component.html +++ b/src/app/content-blocks/block-grid/block-grid.component.html @@ -7,7 +7,8 @@
-
+
diff --git a/src/app/content-blocks/block-grid/block-grid.component.scss b/src/app/content-blocks/block-grid/block-grid.component.scss index 26c582d0..db208e11 100644 --- a/src/app/content-blocks/block-grid/block-grid.component.scss +++ b/src/app/content-blocks/block-grid/block-grid.component.scss @@ -132,7 +132,6 @@ font-family: $font-title; font-size: $font-size-h4; background: $color-accent-dark; - border-radius: 0; cursor: pointer; color: $white; outline: none; diff --git a/src/app/content-blocks/block-grid/block-grid.component.ts b/src/app/content-blocks/block-grid/block-grid.component.ts index 46776b3b..76d0f5b2 100644 --- a/src/app/content-blocks/block-grid/block-grid.component.ts +++ b/src/app/content-blocks/block-grid/block-grid.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { ContentfulService } from '../../core/contentful.service'; +import { Page } from '../../core/interfaces/page.interface'; @Component({ selector: 'asm-block-grid', @@ -58,6 +59,13 @@ export class BlockGridComponent implements OnInit { return icon; } + getPageBackground(page: Partial) { + if (page.featuredImage && page.featuredImage.url) { + return 'url(' + page.featuredImage.url + '?h=345)'; + } + return undefined; + } + onToggleFilter(filter: string) { if (this.activeFilters.has(filter)) { this.activeFilters.delete(filter); @@ -68,4 +76,8 @@ export class BlockGridComponent implements OnInit { return this.activeFilters.size === 0 || (page.tags && page.tags.some(tag => this.activeFilters.has(tag.title))); }); } + + trackItem(index: number, item: Partial): number | string { + return item.slug || index; + } } diff --git a/src/app/content.resolve.ts b/src/app/content.resolve.ts index ed5f60ec..2bb0c4f6 100644 --- a/src/app/content.resolve.ts +++ b/src/app/content.resolve.ts @@ -129,6 +129,19 @@ export class ContentResolve implements Resolve { } } } + ... on BlockGrid { + pages { + slug + title + tags { + title + } + featuredImage{ + title + url + } + } + } } featuredImage{ title diff --git a/src/index.html b/src/index.html index 18641a23..954546e3 100644 --- a/src/index.html +++ b/src/index.html @@ -1,11 +1,13 @@ + Assembly - + @@ -13,10 +15,11 @@ - + - + @@ -29,11 +32,14 @@ --> - + - - + @@ -72,13 +69,13 @@
- Assembling... + Assembling...
- +