From deaf194797a6363bf55e1a7cc519e8c5159741e4 Mon Sep 17 00:00:00 2001 From: Moises Hastenraiter Da Silva Date: Wed, 6 Sep 2023 19:58:26 -0300 Subject: [PATCH] Foram adicionados Quatro novos artigos ao blog --- package-lock.json | 76 +++++++++++++++++++ package.json | 3 + src/app/app.module.ts | 4 +- .../components/menu-bar/menu-bar.component.ts | 1 + src/app/data/dataFake.ts | 38 +++++++++- src/app/pages/home/home.component.html | 40 ++++++++++ 6 files changed, 160 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index f23c08480..3097797af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,6 +16,9 @@ "@angular/platform-browser": "^14.1.0", "@angular/platform-browser-dynamic": "^14.1.0", "@angular/router": "^14.1.0", + "@fortawesome/angular-fontawesome": "^0.10.0", + "@fortawesome/fontawesome-svg-core": "^1.2.36", + "@fortawesome/free-solid-svg-icons": "^5.15.4", "rxjs": "~7.5.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" @@ -2483,6 +2486,50 @@ "node": ">=10.0.0" } }, + "node_modules/@fortawesome/angular-fontawesome": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/@fortawesome/angular-fontawesome/-/angular-fontawesome-0.10.0.tgz", + "integrity": "sha512-d7gz/zK76KXcGYpexaXH5wkIIenS62sxbUxwstR04HQZpF33S+8KyCnZjo+eCs6akGi9khjU4mVBrVGDySHvVg==", + "dependencies": { + "tslib": "^2.3.1" + }, + "peerDependencies": { + "@fortawesome/fontawesome-svg-core": "^1.2.27" + } + }, + "node_modules/@fortawesome/fontawesome-common-types": { + "version": "0.2.36", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.36.tgz", + "integrity": "sha512-a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg==", + "hasInstallScript": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/fontawesome-svg-core": { + "version": "1.2.36", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.36.tgz", + "integrity": "sha512-YUcsLQKYb6DmaJjIHdDWpBIGCcyE/W+p/LMGvjQem55Mm2XWVAP5kWTMKWLv9lwpCVjpLxPyOMOyUocP1GxrtA==", + "hasInstallScript": true, + "dependencies": { + "@fortawesome/fontawesome-common-types": "^0.2.36" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/free-solid-svg-icons": { + "version": "5.15.4", + "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.4.tgz", + "integrity": "sha512-JLmQfz6tdtwxoihXLg6lT78BorrFyCf59SAwBM6qV/0zXyVeDygJVb3fk+j5Qat+Yvcxp1buLTY5iDh1ZSAQ8w==", + "hasInstallScript": true, + "dependencies": { + "@fortawesome/fontawesome-common-types": "^0.2.36" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/@gar/promisify": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", @@ -13528,6 +13575,35 @@ "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==", "dev": true }, + "@fortawesome/angular-fontawesome": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/@fortawesome/angular-fontawesome/-/angular-fontawesome-0.10.0.tgz", + "integrity": "sha512-d7gz/zK76KXcGYpexaXH5wkIIenS62sxbUxwstR04HQZpF33S+8KyCnZjo+eCs6akGi9khjU4mVBrVGDySHvVg==", + "requires": { + "tslib": "^2.3.1" + } + }, + "@fortawesome/fontawesome-common-types": { + "version": "0.2.36", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.36.tgz", + "integrity": "sha512-a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg==" + }, + "@fortawesome/fontawesome-svg-core": { + "version": "1.2.36", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.36.tgz", + "integrity": "sha512-YUcsLQKYb6DmaJjIHdDWpBIGCcyE/W+p/LMGvjQem55Mm2XWVAP5kWTMKWLv9lwpCVjpLxPyOMOyUocP1GxrtA==", + "requires": { + "@fortawesome/fontawesome-common-types": "^0.2.36" + } + }, + "@fortawesome/free-solid-svg-icons": { + "version": "5.15.4", + "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.4.tgz", + "integrity": "sha512-JLmQfz6tdtwxoihXLg6lT78BorrFyCf59SAwBM6qV/0zXyVeDygJVb3fk+j5Qat+Yvcxp1buLTY5iDh1ZSAQ8w==", + "requires": { + "@fortawesome/fontawesome-common-types": "^0.2.36" + } + }, "@gar/promisify": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", diff --git a/package.json b/package.json index 8b6ea95df..3dee2d994 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,9 @@ "@angular/platform-browser": "^14.1.0", "@angular/platform-browser-dynamic": "^14.1.0", "@angular/router": "^14.1.0", + "@fortawesome/angular-fontawesome": "^0.10.0", + "@fortawesome/fontawesome-svg-core": "^1.2.36", + "@fortawesome/free-solid-svg-icons": "^5.15.4", "rxjs": "~7.5.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" diff --git a/src/app/app.module.ts b/src/app/app.module.ts index e17988a21..31c7df68b 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -9,6 +9,7 @@ import { BigCardComponent } from './components/big-card/big-card.component'; import { SmallCardComponent } from './components/small-card/small-card.component'; import { HomeComponent } from './pages/home/home.component'; import { ContentComponent } from './pages/content/content.component'; +import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; @NgModule({ @@ -23,7 +24,8 @@ import { ContentComponent } from './pages/content/content.component'; ], imports: [ BrowserModule, - AppRoutingModule + AppRoutingModule, + FontAwesomeModule ], providers: [], bootstrap: [AppComponent] diff --git a/src/app/components/menu-bar/menu-bar.component.ts b/src/app/components/menu-bar/menu-bar.component.ts index 056da3c40..8e5f3d7a7 100644 --- a/src/app/components/menu-bar/menu-bar.component.ts +++ b/src/app/components/menu-bar/menu-bar.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; + @Component({ selector: 'app-menu-bar', templateUrl: './menu-bar.component.html', diff --git a/src/app/data/dataFake.ts b/src/app/data/dataFake.ts index 607c3610e..43459ccec 100644 --- a/src/app/data/dataFake.ts +++ b/src/app/data/dataFake.ts @@ -10,5 +10,41 @@ export const dataFake = [ "title": "Nova Série anunciada no Disney +", "description": "bla blabla", "photoCover":"https://disneyplusbrasil.com.br/wp-content/uploads/2021/07/Series-Marvel-Disney-Plus-1024x576.jpg" - } + }, + { + "id":"3", + "title": "Novo filme do pantera negra lançado em breve", + "description": "bla blabla", + "photoCover":"https://prod-ripcut-delivery.disney-plus.net/v1/variant/disney/35720ACD323F927C3A83D809D0F460BD3651740DA519BCC184B6F042057EA14D/scale?width=1200&aspectRatio=1.78&format=jpeg" + }, + { + "id":"4", + "title": "Novo filme dos X-men está em pós produção, afirma diretor", + "description": "bla blabla", + "photoCover":"https://midias.correiobraziliense.com.br/_midias/jpg/2022/07/22/675x450/1_xmen-26096415.jpeg?20220722171339?20220722171339" + }, + { + "id":"5", + "title": "‘Homem-Aranha 4’: Tom Holland só voltará para mais filmes se mudarem o tom da franquia…", + "description": "“Estávamos todos tratando [Homem-Aranha 3] como o fim de uma franquia, digamos. Acho que se tivéssemos a sorte de mergulhar nesses personagens novamente, você veria uma versão muito diferente. Não seria mais a trilogia do Homecoming. Se eu voltar, daríamos algum tempo e tentaríamos construir algo diferente e mudar o tom do filmes. Se isso acontece ou não, eu não sei. Mas estávamos definitivamente tratando como se estivesse chegando ao fim, e parecia que estava.”, afirmou.", + "photoCover":"https://cinepop.com.br/wp-content/uploads/2021/09/demolidor-homem-aranha-1.jpg" + }, + { + "id":"6", + "title": "Capitão América com novo nome?", + "description": "O quarto longa-metragem do herói passará a se chamar Capitão América: Admirável Mundo Novo.", + "photoCover":"https://p2.trrsf.com/image/fget/cf/774/0/images.terra.com/2023/06/09/2095181115-9209fc716e7e2c9c2c56fffbcb7a46a6.jpg" + }, + { + "id":"7", + "title": "Thor: Amor e Trovão", + "description": "Novo filme de Taika Waititi amadurece humor de Thor: Ragnarok e é inesperadamente emotivo", + "photoCover":"https://uploads.jovemnerd.com.br/wp-content/uploads/2022/07/thor_amor_e_trovao_capa__qu0m4x6-1210x544.jpg" + }, + { + "id":"8", + "title": "Marvel confirma o Wolverine como novo hospedeiro da Fênix Negra", + "description": "Novo quadrinho do universo dos X-Men traz grande reviravolta envolvendo Jean Grey e o Wolverine!", + "photoCover":"https://legadodamarvel.com.br/wp-content/uploads/2023/08/legadodamarvel-x-men-fenix-negra-wolverine.webp" + }, ] diff --git a/src/app/pages/home/home.component.html b/src/app/pages/home/home.component.html index 53d749b03..dac074c3f 100644 --- a/src/app/pages/home/home.component.html +++ b/src/app/pages/home/home.component.html @@ -34,5 +34,45 @@ photoCover="https://midias.correiobraziliense.com.br/_midias/jpg/2022/07/22/675x450/1_xmen-26096415.jpeg?20220722171339?20220722171339" > + + + +
+
+ + + + +
+
+ + + + + + + + +