Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/105-header' into 46-footer-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
GabrielaTiago committed Nov 16, 2023
2 parents 9ca7503 + f042af5 commit e5d9091
Show file tree
Hide file tree
Showing 16 changed files with 132 additions and 11 deletions.
8 changes: 7 additions & 1 deletion src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ import { AuthGuard } from './services/auth.guard';
import { EditUserComponent } from './pages/edit-user/edit-user.component';
import { SuggestAgendaComponent } from './pages/suggest-agenda/suggest-agenda.component';
import { ParticipateComponent } from './pages/participate/participate.component';
import { ProgramacaoComponent } from './pages/programacao/programacao.component';
import { AgoraComponent } from './pages/agora/agora.component';
import { TransmissoesComponent } from './pages/transmissoes/transmissoes.component';

const routes: Routes = [
{ path: 'login', component: LoginComponent },
Expand All @@ -28,7 +31,10 @@ const routes: Routes = [
{ path: 'participate', component: ParticipateComponent },
{ path: 'profile', component: ProfileComponent, canActivate: [AuthGuard], },
{ path: 'editUser/:id', component: EditUserComponent, canActivate: [AuthGuard], },
{ path: '', component: HomePageComponent, canActivate: [AuthGuard], }
{ path: '', component: HomePageComponent, canActivate: [AuthGuard], },
{ path: 'programacao', component: ProgramacaoComponent},
{ path: 'agora', component: AgoraComponent},
{ path: 'transmissoes', component: TransmissoesComponent}
];

@NgModule({
Expand Down
4 changes: 4 additions & 0 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import { CheckCodeRestPasswordComponent } from './pages/check-code-rest-password
import { AuthGuard } from './services/auth.guard';
import { AuthService } from './services/auth.service';
import { EditUserComponent } from './pages/edit-user/edit-user.component';
import { AgoraComponent } from './pages/agora/agora.component';
import { ProgramacaoComponent } from './pages/programacao/programacao.component';
import { SuggestAgendaComponent } from './pages/suggest-agenda/suggest-agenda.component';
import { ParticipateComponent } from './pages/participate/participate.component';

Expand All @@ -42,6 +44,8 @@ import { ParticipateComponent } from './pages/participate/participate.component'
ResetPasswordComponent,
CheckCodeRestPasswordComponent,
EditUserComponent,
AgoraComponent,
ProgramacaoComponent,
SuggestAgendaComponent,
ParticipateComponent,
],
Expand Down
21 changes: 13 additions & 8 deletions src/app/components/background/background.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,19 @@
<img alt="simbolo-unb" src="../../../assets/Simbolo_UnBTV-01 1.png">
</div>
<div class="flex flex-row items-center justify-center w-full">
<div class="text-programs">
<div class="px-2 cursor-pointer">Início</div>|
<div class="px-2 cursor-pointer">Agora na TV</div>|
<div class="px-2 cursor-pointer">Programação</div>|
<div class="px-2 cursor-pointer">Transmissões</div>|
<div class="pl-2 cursor-pointer" [routerLink]="['/participate']">Participe</div>
</div>
<img class="cursor-pointer" alt="hamburguer" src="../../../assets/hamburguer.svg">
<nav class="text-programs">
<a routerLink="" class="px-2 cursor-pointer">Início</a>|
<a routerLink="/agora" class="px-2 cursor-pointer">Agora na TV</a>|
<a routerLink="/programacao" class="px-2 cursor-pointer">Programação</a>|
<a routerLink="/transmissoes" class="pl-2 cursor-pointer">Transmissões</a>

</nav>
<img alt="hamburguer" class="cursor-pointer" (click)="toggleMenu()" src="../../../assets/hamburguer.svg">
</div>
<div class="menu flex flex-col" *ngIf="isMenuOpened">
<a class="menu-item cursor-pointer">teste</a>
<a class="menu-item cursor-pointer">teste</a>
<a class="menu-item cursor-pointer">teste</a>
</div>
</div>
<div class="flex-grow">
Expand Down
7 changes: 5 additions & 2 deletions src/app/components/background/background.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ import { Component } from '@angular/core';
styleUrls: ['./background.component.css']
})
export class BackgroundComponent {

}
isMenuOpened: boolean = false;

toggleMenu(): void {
this.isMenuOpened = !this.isMenuOpened;
}
}
Empty file.
1 change: 1 addition & 0 deletions src/app/pages/agora/agora.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<p>agora works!</p>
23 changes: 23 additions & 0 deletions src/app/pages/agora/agora.component.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';

import { AgoraComponent } from './agora.component';

describe('AgoraComponent', () => {
let component: AgoraComponent;
let fixture: ComponentFixture<AgoraComponent>;

beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ AgoraComponent ]
})
.compileComponents();

fixture = TestBed.createComponent(AgoraComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
});
10 changes: 10 additions & 0 deletions src/app/pages/agora/agora.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { Component } from '@angular/core';

@Component({
selector: 'app-agora',
templateUrl: './agora.component.html',
styleUrls: ['./agora.component.css']
})
export class AgoraComponent {

}
Empty file.
1 change: 1 addition & 0 deletions src/app/pages/programacao/programacao.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<p>programacao works!</p>
23 changes: 23 additions & 0 deletions src/app/pages/programacao/programacao.component.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';

import { ProgramacaoComponent } from './programacao.component';

describe('ProgramacaoComponent', () => {
let component: ProgramacaoComponent;
let fixture: ComponentFixture<ProgramacaoComponent>;

beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ ProgramacaoComponent ]
})
.compileComponents();

fixture = TestBed.createComponent(ProgramacaoComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
});
10 changes: 10 additions & 0 deletions src/app/pages/programacao/programacao.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { Component } from '@angular/core';

@Component({
selector: 'app-programacao',
templateUrl: './programacao.component.html',
styleUrls: ['./programacao.component.css']
})
export class ProgramacaoComponent {

}
Empty file.
1 change: 1 addition & 0 deletions src/app/pages/transmissoes/transmissoes.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<p>transmissoes works!</p>
23 changes: 23 additions & 0 deletions src/app/pages/transmissoes/transmissoes.component.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';

import { TransmissoesComponent } from './transmissoes.component';

describe('TransmissoesComponent', () => {
let component: TransmissoesComponent;
let fixture: ComponentFixture<TransmissoesComponent>;

beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [TransmissoesComponent]
})
.compileComponents();

fixture = TestBed.createComponent(TransmissoesComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
});
11 changes: 11 additions & 0 deletions src/app/pages/transmissoes/transmissoes.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { Component } from '@angular/core';

@Component({
selector: 'app-transmissoes',
templateUrl: './transmissoes.component.html',
styleUrls: ['./transmissoes.component.css']

})
export class TransmissoesComponent {

}

0 comments on commit e5d9091

Please sign in to comment.