diff --git a/src/app/@core/mock/users.service.ts b/src/app/@core/mock/users.service.ts index 8c748ce0..721a01eb 100644 --- a/src/app/@core/mock/users.service.ts +++ b/src/app/@core/mock/users.service.ts @@ -8,7 +8,7 @@ export class UserService extends UserData { private time: Date = new Date; private users = { - nick: { name: 'Nick Jones', picture: 'assets/images/nick.png' }, + nick: { name: 'DG', picture: 'assets/images/Logo_siglas.png' }, eva: { name: 'Eva Moor', picture: 'assets/images/eva.png' }, jack: { name: 'Jack Williams', picture: 'assets/images/jack.png' }, lee: { name: 'Lee Wong', picture: 'assets/images/lee.png' }, diff --git a/src/app/@theme/components/header/header.component.html b/src/app/@theme/components/header/header.component.html index b9895ad0..8fd2b225 100644 --- a/src/app/@theme/components/header/header.component.html +++ b/src/app/@theme/components/header/header.component.html @@ -10,6 +10,7 @@ diff --git a/src/app/admin/dashboard/rooms/rooms.component.scss b/src/app/admin/dashboard/rooms/rooms.component.scss index 3d40e69d..eec34ea0 100644 --- a/src/app/admin/dashboard/rooms/rooms.component.scss +++ b/src/app/admin/dashboard/rooms/rooms.component.scss @@ -6,12 +6,7 @@ ngx-room-selector { width: 70%; border-right: nb-theme(divider-width) nb-theme(divider-style) nb-theme(divider-color); - background: url('../../../../assets/images/square_pattern.svg') repeat; background-size: 75px; - - &.dark-background { - background-image: url('../../../../assets/images/square_pattern_cosmic.svg'); - } } ngx-player { diff --git a/src/app/public/@shared/components/product-card/product-card.component.html b/src/app/public/@shared/components/product-card/product-card.component.html index 7f36f228..2b716df2 100644 --- a/src/app/public/@shared/components/product-card/product-card.component.html +++ b/src/app/public/@shared/components/product-card/product-card.component.html @@ -5,7 +5,7 @@ - Destaque + Impulsionado
{{ product.name }}
diff --git a/src/app/public/@shared/components/product-card/product-card.component.scss b/src/app/public/@shared/components/product-card/product-card.component.scss index 510cdbc8..e2004fd4 100644 --- a/src/app/public/@shared/components/product-card/product-card.component.scss +++ b/src/app/public/@shared/components/product-card/product-card.component.scss @@ -4,6 +4,8 @@ .product { cursor: pointer; + min-height: 365px; + max-height: 365px; } .card-img-top { @@ -60,7 +62,7 @@ .card-img-top span.badge { align-items: center; - background: blue; + background: #107e02; color:white; font-weight: 600; overflow: hidden; diff --git a/src/app/public/home/banner/banner.component.scss b/src/app/public/home/banner/banner.component.scss index 28bb23b5..19ba32a6 100644 --- a/src/app/public/home/banner/banner.component.scss +++ b/src/app/public/home/banner/banner.component.scss @@ -17,12 +17,17 @@ mdb-carousel { width: 100%; /* Largura total do carrossel */ - height: 320px; /* Altura do carrossel */ + height: auto; /* Altura do carrossel */ } -mdb-carousel-item { +.carousel-item { width: 100%; /* A imagem ocupa toda a largura do carrossel */ - height: 80%; /* A imagem ocupa toda a altura do carrossel */ - max-height: 320px; - object-fit: cover; /* A imagem será cortada para cobrir o espaço sem distorcer */ + height: 367px; /* A imagem ocupa toda a altura do carrossel */ + max-height: 367px; +} + +.carousel-item img { + width: 100%; /* A imagem ocupa toda a largura do carrossel */ + height: 367px; /* A imagem ocupa toda a altura do carrossel */ + max-height: 367px; } \ No newline at end of file diff --git a/src/app/public/home/home.component.html b/src/app/public/home/home.component.html index d7f0d85c..38b561d6 100644 --- a/src/app/public/home/home.component.html +++ b/src/app/public/home/home.component.html @@ -15,14 +15,20 @@
-
-

Anúncios patrocinados

-
+ + +
+
+
+ +
+
+
diff --git a/src/app/public/home/home.component.scss b/src/app/public/home/home.component.scss index 4d307c59..84a2964d 100644 --- a/src/app/public/home/home.component.scss +++ b/src/app/public/home/home.component.scss @@ -34,7 +34,6 @@ mdb-carousel-item { justify-content: center; width: 970px; height: 90px; - margin: 24px 12px; border: 1px gray; } diff --git a/src/app/public/home/home.component.ts b/src/app/public/home/home.component.ts index 64f41e63..bd50b57a 100644 --- a/src/app/public/home/home.component.ts +++ b/src/app/public/home/home.component.ts @@ -25,6 +25,7 @@ export class HomeComponent implements OnDestroy { banners: Banner[]; categories: Category[]; products: Product[]; + recentProducts: Product[]; paidAds: any[]; constructor() {} @@ -66,14 +67,14 @@ export class HomeComponent implements OnDestroy { "id": "acessorios", "updatedAt": new Date(), "createdAt": new Date(), - "icon": "fa-scissors" + "icon": "fa-binoculars" }, { "name": "Outros", "id": "outros", "updatedAt": new Date(), "createdAt": new Date(), - "icon": "fa-spider" + "icon": "fa-plus" } ] @@ -110,7 +111,7 @@ export class HomeComponent implements OnDestroy { previousPrice: 199, createdAt: new Date(), isActive: true, - isPromoted: false, + isPromoted: true, viewCount: 0, img_urls: [ "../../../assets/images/Exaustor2.png" @@ -261,6 +262,15 @@ export class HomeComponent implements OnDestroy { ] }] + this.recentProducts = JSON.parse(JSON.stringify(this.products)) + + this.recentProducts = this.recentProducts.reverse() + + this.recentProducts.forEach(p => { + p.isPromoted = false; + return p; + }); + } ngOnDestroy() { diff --git a/src/assets/images/Logo_siglas.png b/src/assets/images/Logo_siglas.png new file mode 100644 index 00000000..f0cad3e5 Binary files /dev/null and b/src/assets/images/Logo_siglas.png differ