From 5538a2206c21e80779e9673efccff00bd356ecdd Mon Sep 17 00:00:00 2001 From: Marcos Castilhos <221008300@aluno.unb.br> Date: Wed, 29 Nov 2023 20:19:02 -0300 Subject: [PATCH 1/4] Esconde o header na tela de login Co-authored-by: nYCSTs --- src/app/components/background/background.component.html | 2 ++ src/app/components/background/background.component.ts | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/src/app/components/background/background.component.html b/src/app/components/background/background.component.html index 313d363e..c916e695 100644 --- a/src/app/components/background/background.component.html +++ b/src/app/components/background/background.component.html @@ -3,6 +3,7 @@
simbolo-unb
+
+
diff --git a/src/app/components/background/background.component.ts b/src/app/components/background/background.component.ts index 34f00dee..deec8ea7 100644 --- a/src/app/components/background/background.component.ts +++ b/src/app/components/background/background.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { MenuItem, MessageService } from 'primeng/api'; +import { AppComponent } from 'src/app/app.component'; @Component({ selector: 'app-background', @@ -10,6 +11,7 @@ import { MenuItem, MessageService } from 'primeng/api'; export class BackgroundComponent implements OnInit { items: MenuItem[] = []; mobileDevide: boolean = true; + isLoginPage: boolean = false; constructor() {} @@ -21,6 +23,7 @@ export class BackgroundComponent implements OnInit { }, ]; this.identifiesUserDevice(); + this.getActiveRoute(); } identifiesUserDevice(): void { @@ -37,4 +40,7 @@ export class BackgroundComponent implements OnInit { this.mobileDevide = false; } } + getActiveRoute(): boolean { + return window.location.pathname === '/login'; + } } From d1f719ac653e34769788342a5e6768f1dc9f02c7 Mon Sep 17 00:00:00 2001 From: Marcos Castilhos <221008300@aluno.unb.br> Date: Thu, 30 Nov 2023 18:25:19 -0300 Subject: [PATCH 2/4] =?UTF-8?q?Adiciona=20m=C3=A9todo=20getActualRoute?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/components/background/background.component.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/app/components/background/background.component.ts b/src/app/components/background/background.component.ts index deec8ea7..c4d9f2ff 100644 --- a/src/app/components/background/background.component.ts +++ b/src/app/components/background/background.component.ts @@ -11,7 +11,6 @@ import { AppComponent } from 'src/app/app.component'; export class BackgroundComponent implements OnInit { items: MenuItem[] = []; mobileDevide: boolean = true; - isLoginPage: boolean = false; constructor() {} @@ -23,7 +22,6 @@ export class BackgroundComponent implements OnInit { }, ]; this.identifiesUserDevice(); - this.getActiveRoute(); } identifiesUserDevice(): void { @@ -40,7 +38,7 @@ export class BackgroundComponent implements OnInit { this.mobileDevide = false; } } - getActiveRoute(): boolean { - return window.location.pathname === '/login'; + getActualRoute(): string { + return window.location.pathname; } } From 578aa1b03ff9a4c75f56cabccad9362557a1eb7c Mon Sep 17 00:00:00 2001 From: Marcos Castilhos <221008300@aluno.unb.br> Date: Thu, 30 Nov 2023 18:25:29 -0300 Subject: [PATCH 3/4] Destaca pagina atual no header Co-authored-by: Gabriela Tiago --- .../background/background.component.html | 38 ++++++++++++++++--- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/src/app/components/background/background.component.html b/src/app/components/background/background.component.html index c916e695..58e81e84 100644 --- a/src/app/components/background/background.component.html +++ b/src/app/components/background/background.component.html @@ -3,24 +3,52 @@
simbolo-unb
-
+
+
  • - Catálogo + Agora na TV
  • +
    +
    |
    +
    +
  • + Catálogo +
  • +
    +
    +
  • + Catálogo +
  • +
    |
    +
    +
  • + Programação +
  • +
    +
  • Programação
  • +
    |
    -
  • +
    +
  • Participe
  • +
    +
    +
  • + Participe +
  • +
    From 5dba3a0b36d13b2001abaf4b61cf0ebf8c4cb071 Mon Sep 17 00:00:00 2001 From: DaviMarinho Date: Thu, 30 Nov 2023 22:23:22 -0300 Subject: [PATCH 4/4] Corrige cor do header Signed-off-by: DaviMarinho --- .../background/background.component.html | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/app/components/background/background.component.html b/src/app/components/background/background.component.html index 58e81e84..fa449f34 100644 --- a/src/app/components/background/background.component.html +++ b/src/app/components/background/background.component.html @@ -3,22 +3,22 @@
    simbolo-unb
    -
    +