Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,932 changes: 1,501 additions & 431 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"devDependencies": {
"@angular-devkit/build-angular": "^14.1.2",
"@angular/cli": "~14.1.2",
"@angular/cli": "^14.2.12",
"@angular/compiler-cli": "^14.1.0",
"@types/jasmine": "~4.0.0",
"jasmine-core": "~4.2.0",
Expand Down
11 changes: 3 additions & 8 deletions src/app/components/big-card/big-card.component.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
<div class="container__big-card">

<div class="big-card__photo">
<img
src="{{ photoCover }}"
alt=""
height="200px"
srcset=""
>
<a [routerLink]="['content', Id]"><img src="{{ photoCover }}" alt="{{ cardTitle }}" height="200px" srcset=""></a>
</div>

<div class="big-card__title">
Expand All @@ -16,9 +11,9 @@ <h1><a [routerLink]="['content', Id]">{{ cardTitle }}</a></h1>
<div class="big-card__description">
<p>
<a [routerLink]="['content', Id]">
{{ cardDescription }}
{{ cardDescription }}
</a>
</p>
</div>

</div>
</div>
12 changes: 8 additions & 4 deletions src/app/components/menu-bar/menu-bar.component.css
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@


.container__menu-bar > ul{
.container__menu-bar > ul {
display: flex;
flex-direction: row;
}

.container__menu-bar > ul > li{
.container__menu-bar > ul > li {
margin-right: 20px;
list-style: none;
padding-left: 2px;
}

.container__menu-bar > ul > li > a:hover {
background-color: grey;
color: #111111;
padding: 5px;
}
12 changes: 6 additions & 6 deletions src/app/components/menu-bar/menu-bar.component.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<div class="container__menu-bar">
<ul>
<li><a href="https://linkedin.com/in/felipe-aguiar-exe">Linkedin</a></li>
<li><span></span></li>
<li><a href="https://github.com/felipeAguiarCode">Github</a></li>
<li><span></span></li>
<li><a href="https://www.youtube.com/channel/UCCcDZkI7AITYFCgDEFV9OoQ">Youtube</a></li>
<li><a href="https://www.linkedin.com/in/emersonbbezerra/" target="_blank">Linkedin</a></li>
<li><span>|</span></li>
<li><a href="https://github.com/emersonbbezerra" target="_blank">Github</a></li>
<li><span>|</span></li>
<li><a href="https://www.youtube.com/@mundo_todo" target="_blank">Youtube</a></li>
</ul>
</div>
</div>
9 changes: 5 additions & 4 deletions src/app/components/menu-title/menu-title.component.css
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
.container__menu-title{
.container__menu-title {
color: white;
}

.container__menu-title > h1{
.container__menu-title > h1 {
margin-top: 15px;
margin-bottom: 15px;
font-size: 135px;
font-family: 'segoe UI';
font-family: "segoe UI";
display: flex;
justify-content: center;
}

.container__menu-title > hr{
.container__menu-title > hr {
margin-top: 20px;
margin-bottom: 5px;
border-color: grey;
}
6 changes: 3 additions & 3 deletions src/app/components/menu-title/menu-title.component.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="container__menu-title">
<hr/>
<hr />
<h1>MARVEL BLOG</h1>
<hr/>
</div>
<hr />
</div>
10 changes: 7 additions & 3 deletions src/app/components/small-card/small-card.component.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.container__small-card{
.container__small-card {
width: 700px;
margin-bottom: 15px;
}

.container__small-card-content{
.container__small-card-content {
display: flex;
flex-direction: row;
}
Expand All @@ -20,6 +20,10 @@
align-items: center;
}

.container__small-card__separator{
.container__small-card__separator {
margin-top: 10px;
}

.container__small-card__separator > hr {
border-color: grey;
}
19 changes: 7 additions & 12 deletions src/app/components/small-card/small-card.component.html
Original file line number Diff line number Diff line change
@@ -1,24 +1,19 @@
<div class="container__small-card">

<div class="container__small-card-content">
<div class="small-card__photo">
<img
src="{{ photoCover }}"
alt=""
srcset=""
>
</div>
<a [routerLink]="['content', Id]">
<div class="small-card__photo">
<img src="{{ photoCover }}" alt="{{ cardTitle }}" srcset="">
</div>
</a>

<div class="small-card__title">
<h1><a [routerLink]="['content', Id]" >{{ cardTitle }}</a></h1>
<h1><a [routerLink]="['content', Id]">{{ cardTitle }}</a></h1>
</div>
</div>

<div class="container__small-card__separator">
<hr>
</div>

</div>



</div>
12 changes: 12 additions & 0 deletions src/app/data/dataFake.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,17 @@ 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": "Nova filme do Pantera Negra",
"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",
"description": "bla blabla",
"photoCover":"https://midias.correiobraziliense.com.br/_midias/jpg/2022/07/22/675x450/1_xmen-26096415.jpeg?20220722171339?20220722171339"
}
]
21 changes: 15 additions & 6 deletions src/app/pages/content/content.component.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.container__content{

.container__content {
width: 100%;
height: 100vh;

Expand All @@ -11,19 +10,29 @@
align-items: center;
}

.content__cover > img{
border:5px solid rgb(144, 144, 144);
.content__cover > img {
border: 5px solid rgb(144, 144, 144);
border-radius: 5px;
width: 500px;
min-width: 500px;
height: 300px;
}

.content__description{
.content__title > hr {
border-color: grey;
}

.content__description {
margin-top: 15px;
}

.content__description > p{
.content__description > a:hover {
background-color: grey;
color: black;
padding: 5px;
}

.content__description > p {
margin-top: 20px;
color: rgb(198, 197, 197);
}
11 changes: 6 additions & 5 deletions src/app/pages/content/content.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ <h1>{{ contentTitle }}</h1>
<hr />
</div>
<div class="content__description">
<a [routerLink]="['']"> << VOLTAR </a>
<p>
{{ contentDescription }}
</p>
<a [routerLink]="['']">
<< VOLTAR</a>
<p>
{{ contentDescription }}
</p>
</div>
</div>
</div>