From e50bf629c6aabdd6fca05993f5116a7adc6ef7de Mon Sep 17 00:00:00 2001 From: csvinhal Date: Sat, 24 Nov 2018 21:53:16 -0200 Subject: [PATCH 1/2] =?UTF-8?q?adicionado=20demais=20informa=C3=A7=C3=B5es?= =?UTF-8?q?=20no=20detalhe=20do=20filme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 15 +++----- package.json | 1 + src/app/app.module.ts | 13 ++++++- src/app/features/home/home.component.html | 4 +- src/app/features/home/home.module.ts | 4 +- .../movie-detail/movie-detail.component.html | 37 ++++++++++++++++--- src/app/shared/models/movie-detail.ts | 2 +- src/app/shared/services/movie.service.ts | 31 ++++++++++++++-- 8 files changed, 81 insertions(+), 26 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2663670..82fbfdc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5604,11 +5604,6 @@ "integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=", "dev": true }, - "jquery": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz", - "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==" - }, "js-base64": { "version": "2.4.9", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.9.tgz", @@ -6394,6 +6389,11 @@ "minimist": "0.0.8" } }, + "moment": { + "version": "2.22.2", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz", + "integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=" + }, "move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", @@ -7297,11 +7297,6 @@ "find-up": "^2.1.0" } }, - "popper.js": { - "version": "1.14.5", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.5.tgz", - "integrity": "sha512-fs4Sd8bZLgEzrk8aS7Em1qh+wcawtE87kRUJQhK6+LndyV1HerX7+LURzAylVaTyWIn5NTB/lyjnWqw/AZ6Yrw==" - }, "portfinder": { "version": "1.0.17", "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.17.tgz", diff --git a/package.json b/package.json index 97d0d63..91d61f2 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "bootstrap": "^4.1.3", "core-js": "^2.5.4", "express": "^4.16.4", + "moment": "^2.22.2", "path": "^0.12.7", "rxjs": "~6.3.3", "zone.js": "~0.8.26" diff --git a/src/app/app.module.ts b/src/app/app.module.ts index dec223f..2f05b75 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,5 +1,5 @@ import { HttpClientJsonpModule, HttpClientModule } from '@angular/common/http'; -import { NgModule } from '@angular/core'; +import { LOCALE_ID, NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterModule } from '@angular/router'; @@ -7,6 +7,10 @@ import { RouterModule } from '@angular/router'; import { AppeRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { FeaturesModule } from './features/features.module'; +import { registerLocaleData } from '@angular/common'; +import localePt from '@angular/common/locales/pt'; + +registerLocaleData(localePt, 'pt'); @NgModule({ declarations: [AppComponent], @@ -19,7 +23,12 @@ import { FeaturesModule } from './features/features.module'; AppeRoutingModule, FeaturesModule ], - providers: [], + providers: [ + { + provide: LOCALE_ID, + useValue: 'pt' + } + ], bootstrap: [AppComponent] }) export class AppModule {} diff --git a/src/app/features/home/home.component.html b/src/app/features/home/home.component.html index 9f90f42..6db9dc3 100644 --- a/src/app/features/home/home.component.html +++ b/src/app/features/home/home.component.html @@ -1,6 +1,6 @@
-
+

Social Movies

Todos os filmes em um só lugar!Social Movies
-
+
Detalhes do filme
-
+
A generic square placeholder image with rounded corners in a figure.
- Poster do filme {{ movieDetail?.title }}. + Poster do filme.
-

{{ movieDetail?.title }}

-
+

+ {{ movieDetail?.title }} ({{ movieDetail?.year }}) +

+

{{ movieDetail?.plot }}

+ +
+ Data de lançamento: + {{ movieDetail?.released }} +
+ +
+ Tempo de duração: + {{ movieDetail?.runtime }} +
+ +
+ Genero: + {{ movieDetail?.genre }} +
+ +
+ Diretor: + {{ movieDetail?.director }} +
+ +
+ Valor de Bilheteria: + {{ movieDetail?.boxOffice }} +
diff --git a/src/app/shared/models/movie-detail.ts b/src/app/shared/models/movie-detail.ts index ca7268b..4d07a51 100644 --- a/src/app/shared/models/movie-detail.ts +++ b/src/app/shared/models/movie-detail.ts @@ -7,5 +7,5 @@ export interface MovieDetail extends Movie { director: string; poster: string; plot: string; - value: string; + boxOffice: string; } diff --git a/src/app/shared/services/movie.service.ts b/src/app/shared/services/movie.service.ts index 5975d67..0206ced 100644 --- a/src/app/shared/services/movie.service.ts +++ b/src/app/shared/services/movie.service.ts @@ -1,16 +1,21 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { map } from 'rxjs/operators'; +import * as moment from 'moment'; import { environment } from '../../../environments/environment'; import { Movie } from '../models/movie'; import { MovieDetail } from '../models/movie-detail'; +import { CurrencyPipe } from '@angular/common'; @Injectable({ providedIn: 'root' }) export class MovieService { private apiUrl = `//www.omdbapi.com/?apikey=${environment.apiKey}`; - constructor(private httpClient: HttpClient) {} + constructor( + private httpClient: HttpClient, + private currencyPipe: CurrencyPipe + ) {} public listMovies(term: string, page = '1') { return this.httpClient @@ -45,12 +50,30 @@ export class MovieService { movie.imdb = info.imdbID; movie.title = info.Title; movie.year = info.Year; - movie.released = info.Released; + movie.released = + info.Released && info.Released !== 'N/A' + ? moment(info.Released, 'DD MMM YYYY').format('DD/MM/YYYY') + : info.Released; movie.runtime = info.Runtime; movie.genre = info.Genre; movie.director = info.Director; - movie.poster = info.Poster && info.Poster !== 'N/A' ? info.Poster : 'assets/no-image.jpg'; - movie.plot = info.Plot && info.Plot !== 'N/A' ? info.Plot : 'Sem descrição disponível.'; + movie.poster = + info.Poster && info.Poster !== 'N/A' + ? info.Poster + : 'assets/no-image.jpg'; + movie.plot = + info.Plot && info.Plot !== 'N/A' + ? info.Plot + : 'Sem descrição disponível.'; + movie.boxOffice = + info.BoxOffice && info.BoxOffice !== 'N/A' + ? this.currencyPipe.transform( + info.BoxOffice.replace('$', '').replace(/,/g, ''), + 'BRL', + 'symbol-narrow', + '1.2-2' + ) + : info.BoxOffice || 'N/A'; return movie as MovieDetail; } } From d9074825d9b71726901562eb67361ca86f5b36ef Mon Sep 17 00:00:00 2001 From: csvinhal Date: Sat, 24 Nov 2018 21:57:11 -0200 Subject: [PATCH 2/2] ajustes teste --- src/app/features/home/home.component.spec.ts | 3 ++- .../features/home/movie-detail/movie-detail.component.spec.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/features/home/home.component.spec.ts b/src/app/features/home/home.component.spec.ts index c97f399..252aaf7 100644 --- a/src/app/features/home/home.component.spec.ts +++ b/src/app/features/home/home.component.spec.ts @@ -1,3 +1,4 @@ +import { CurrencyPipe } from '@angular/common'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; @@ -26,7 +27,7 @@ describe('HomeComponent', () => { NgbModalModule, NgbPaginationModule ], - providers: [NgbActiveModal] + providers: [NgbActiveModal, CurrencyPipe] }).compileComponents(); })); diff --git a/src/app/features/home/movie-detail/movie-detail.component.spec.ts b/src/app/features/home/movie-detail/movie-detail.component.spec.ts index a137680..e4c9465 100644 --- a/src/app/features/home/movie-detail/movie-detail.component.spec.ts +++ b/src/app/features/home/movie-detail/movie-detail.component.spec.ts @@ -1,3 +1,4 @@ +import { CurrencyPipe } from '@angular/common'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; @@ -12,7 +13,7 @@ describe('MovieDetailComponent', () => { TestBed.configureTestingModule({ declarations: [MovieDetailComponent], imports: [HttpClientTestingModule], - providers: [NgbActiveModal] + providers: [NgbActiveModal, CurrencyPipe] }).compileComponents(); }));