9008c7f842e9b2d0a7850ce4beb44e8f75e5bb17 to 8fa492345262bdcea440010d467d0a0179d49ae3 · web-et-numerique / Factory / Resin / Client

src/app/post/components/post-card/post-card.component.html

+1
−7

Original line number
Diff line number
Diff line

@@ -17,13 +17,7 @@

    />

  </div>

  <div fxLayout="column" fxLayoutGap="8px" fxLayoutAlign="center">

    <div fxLayout="row" class="tag" fxLayoutAlign=" center" fxLayoutGap="12px" *ngIf="post.tags[0]">

      <span>{{ post.tags[0].name }}</span>

    </div>

    <div fxLayout="row" class="tag" fxLayoutAlign=" center" fxLayoutGap="12px" *ngIf="!post.tags[0]">

      <span>info</span>

    </div>

    <app-post-tag [post]="post"></app-post-tag>

    <div fxLayout="row" class="title">

      {{ post.title }}

    </div>

src/app/post/components/post-card/post-card.component.scss

+1
−7

Original line number
Diff line number
Diff line

@@ -15,13 +15,7 @@

      }

    }

  }

  .tag {

    @include cn-bold-16;

    text-transform: uppercase;

    color: $secondary-color;

    fill: $secondary-color;

    stroke: $secondary-color;

  }

  .title {

    @media #{$large-phone} {

      @include cn-bold-18;

src/app/post/components/post-card/post-card.component.ts

+2
−2

Original line number
Diff line number
Diff line

import { Component, Input, OnInit } from '@angular/core';

import { Component, Input } from '@angular/core';

import { Router } from '@angular/router';

import { TagEnum } from '../../enum/tag.enum';

import { Post } from '../../models/post.model';

@@ -19,6 +19,6 @@ export class PostCardComponent {

  }

  public isAppelAProjet(): boolean {

    return this.post.tags[0].slug === this.tagEnum.appels;

    return this.post.tags[0] && this.post.tags[0].slug === this.tagEnum.appels;

  }

}

src/app/post/components/post-details/post-details.component.html

+1
−6

Original line number
Diff line number
Diff line

@@ -9,12 +9,7 @@

  </div>

  <div class="gh-canvas">

    <div fxLayout="column" fxLayoutAlign="center none">

      <div *ngIf="post.tags[0]" fxLayout="row" class="tag" fxLayoutAlign=" center" fxLayoutGap="12px">

        <span>{{ post.tags[0].name }}</span>

      </div>

      <div *ngIf="!post.tags[0]" fxLayout="row" class="tag" fxLayoutAlign=" center" fxLayoutGap="12px">

        <span>Infos</span>

      </div>

      <app-post-tag [post]="post"></app-post-tag>

      <div fxLayout="row" class="title">{{ post.title }}</div>

      <div fxLayout="column" class="informations">

        <div>{{ post.author }}</div>

src/app/post/components/post-details/post-details.component.scss

+0
−7

Original line number
Diff line number
Diff line

@@ -14,13 +14,6 @@

  }

}

.tag {

  @include cn-bold-16;

  text-transform: uppercase;

  color: $secondary-color;

  fill: $secondary-color;

  stroke: $secondary-color;

}

.informations {

  @include cn-regular-16;

  div:nth-child(2n) {

src/app/post/components/post-list/post-list.component.scss

+1
−0

Original line number
Diff line number
Diff line

@@ -130,6 +130,7 @@ h2 {

    grid-template-columns: repeat(auto-fill, minmax(7%, 1fr));

    grid-column-gap: 1%;

    grid-row-gap: 40px;

    max-width: 1080px;

    .col:nth-child(6n + 1) {

      @include big-container;

      @media #{$news-max} {

src/app/post/components/post-list/post-list.component.ts

+8
−2

Original line number
Diff line number
Diff line

@@ -68,14 +68,20 @@ export class PostListComponent implements OnInit {

    });

  }

  /**

   * Fill articles list with headline handling

   * @param news {PostWithMeta}

   */

  public fillArticles(news: PostWithMeta): void {

    this.setNews(news);

    const headLineTag = this.allPosts.filter((post: Post) => post.tags.some((tag) => tag.slug === TagEnum.aLaUne));

    const headLineTag = this.allPosts.filter((post: Post) =>

      post.tags.some((tag) => tag && tag.slug === TagEnum.aLaUne)

    );

    const headIndex = this.allPosts.findIndex((post) => post.id === headLineTag[0].id);

    this.allPosts.splice(headIndex, 1);

    this.allPosts = [...headLineTag, ...this.allPosts];

    this.allPosts = [...headLineTag, ..._.difference(this.allPosts, headLineTag)];

  }

  public getPosts(filters?: Tag[]): void {

src/app/post/components/post-tag/post-tag.component.html0 → 100644

+8
−0

Original line number
Diff line number
Diff line

<div>

  <div fxLayout="row" class="tag" fxLayoutAlign=" center" fxLayoutGap="12px" *ngIf="post.tags[0]">

    <span>{{ displayTag(post) }}</span>

  </div>

  <div fxLayout="row" class="tag" fxLayoutAlign=" center" fxLayoutGap="12px" *ngIf="!post.tags[0]">

    <span>infos</span>

  </div>

</div>

src/app/post/components/post-tag/post-tag.component.scss0 → 100644

+10
−0

Original line number
Diff line number
Diff line

@import '../../../../assets/scss/typography';

@import '../../../../assets/scss/color';

.tag {

  @include cn-bold-16;

  text-transform: uppercase;

  color: $secondary-color;

  fill: $secondary-color;

  stroke: $secondary-color;

}

src/app/post/components/post-tag/post-tag.component.spec.ts0 → 100644

+25
−0

Original line number
Diff line number
Diff line

import { ComponentFixture, TestBed } from '@angular/core/testing';

import { PostTagComponent } from './post-tag.component';

describe('PostTagComponent', () => {

  let component: PostTagComponent;

  let fixture: ComponentFixture<PostTagComponent>;

  beforeEach(async () => {

    await TestBed.configureTestingModule({

      declarations: [ PostTagComponent ]

    })

    .compileComponents();

  });

  beforeEach(() => {

    fixture = TestBed.createComponent(PostTagComponent);

    component = fixture.componentInstance;

    fixture.detectChanges();

  });

  it('should create', () => {

    expect(component).toBeTruthy();

  });

});

src/app/post/components/post-tag/post-tag.component.ts0 → 100644

+19
−0

Original line number
Diff line number
Diff line

import { Component, Input } from '@angular/core';

import { TagEnum } from '../../enum/tag.enum';

import { Post } from '../../models/post.model';

@Component({

  selector: 'app-post-tag',

  templateUrl: './post-tag.component.html',

  styleUrls: ['./post-tag.component.scss'],

})

export class PostTagComponent {

  @Input() post: Post;

  public displayTag(post: Post): string {

    if (post.tags.length > 1) {

      return post.tags.filter((tag) => tag.slug !== TagEnum.aLaUne)[0].name;

    }

    return post.tags[0].name;

  }

}

src/app/post/post.module.ts

+2
−0

Original line number
Diff line number
Diff line

@@ -10,6 +10,7 @@ import { PostCardComponent } from './components/post-card/post-card.component';

import { PostPublishComponent } from './components/post-publish/post-publish.component';

import { PostModalFiltersComponent } from './components/post-modal-filters/post-modal-filters.component';

import { TagResolver } from './resolvers/tags.resolver';

import { PostTagComponent } from './components/post-tag/post-tag.component';

@NgModule({

  declarations: [

@@ -20,6 +21,7 @@ import { TagResolver } from './resolvers/tags.resolver';

    PostCardComponent,

    PostModalFiltersComponent,

    PostPublishComponent,

    PostTagComponent,

  ],

  imports: [CommonModule, PostRoutingModule, SharedModule],

  providers: [TagResolver],

Compare revisions

Source

Target

Commits on Source 2

Files

src/app/post/components/post-card/post-card.component.html

src/app/post/components/post-card/post-card.component.scss

src/app/post/components/post-card/post-card.component.ts

src/app/post/components/post-details/post-details.component.html

src/app/post/components/post-details/post-details.component.scss

src/app/post/components/post-list/post-list.component.scss

src/app/post/components/post-list/post-list.component.ts

src/app/post/components/post-tag/post-tag.component.html

src/app/post/components/post-tag/post-tag.component.scss

src/app/post/components/post-tag/post-tag.component.spec.ts

src/app/post/components/post-tag/post-tag.component.ts

src/app/post/post.module.ts