',
+ generateLibras: true,
+ generateSubtitle: true,
+ qtAccess: 20,
+ qtLikes: 0,
+ images: [
+ {
+ type: 'DEFAULT',
+ href: 'https://eduplay.rnp.br/portal/assets/videos/images/1699445118833.jpg',
+ },
+ ],
+ channels: [
+ {
+ id: 190265,
+ name: 'UnBTV',
+ },
+ ],
+ },
+ {
+ id: 190984,
+ title: 'Esboços: Ricardo Caldeira',
+ description:
+ '
Quando Ricardo Caldeira desenha parece dançar imprimindo na tela um traço marcante que fala sobre afeto, negritude, ancestralidade. Aqui o artista relembra sua infância e adolescência, os primeiros trabalhos e a relação com a região de São Sebastião, local que o influenciou e que hoje ele transforma por meio da participação em coletivos culturais.
',
+ keywords: 'Esboços; Ricardo Caldeira; UnBTV;',
+ visibility: 'PUBLIC',
+ duration: 1525621,
+ embed:
+ '
',
+ generateLibras: true,
+ generateSubtitle: true,
+ qtAccess: 14,
+ qtLikes: 0,
+ images: [
+ {
+ type: 'DEFAULT',
+ href: 'https://eduplay.rnp.br/portal/assets/videos/images/1699445004278.jpg',
+ },
+ ],
+ channels: [
+ {
+ id: 190265,
+ name: 'UnBTV',
+ },
+ ],
+ },
+ {
+ id: 190334,
+ title: 'Esboços | Fernanda Pacca',
+ description:
+ '
Confetes, braçadeiras de náilon, botões, linhas de costuras compõe a palheta de cores que constroem surpreendentes figuras humanas na obra de Fernanda Pacca. Trabalhos que impressionam pela forma e abordam diversos temas como o fascínio pelo anatomia, a repressão - tanto estética quanto social - e a violência contra a mulher.
',
+ keywords: 'Fernanda Pacca; Esboços; unbtv;',
+ visibility: 'PUBLIC',
+ duration: 1550174,
+ embed:
+ '
',
+ generateLibras: true,
+ generateSubtitle: true,
+ qtAccess: 15,
+ qtLikes: 0,
+ images: [
+ {
+ type: 'DEFAULT',
+ href: 'https://eduplay.rnp.br/portal/assets/videos/images/1698243181940.jpg',
+ },
+ ],
+ channels: [
+ {
+ id: 190265,
+ name: 'UnBTV',
+ },
+ ],
+ },
+ {
+ id: 190333,
+ title: 'Esboços | Valéria Pena-Costa',
+ description:
+ '
Poeira, insetos, objetos em deterioração são, ao mesmo tempo, tema e matéria-prima para a obra de Valéria Pena-Costa em um trabalho que reflete a inevitável passagem do tempo, as memórias de infância, os medos passados e presentes em diferentes formas de expressão.
',
+ keywords: 'Valéria Pena-Costa; Esboços; unbtv;',
+ visibility: 'PUBLIC',
+ duration: 1547193,
+ embed:
+ '
',
+ generateLibras: true,
+ generateSubtitle: true,
+ qtAccess: 23,
+ qtLikes: 0,
+ images: [
+ {
+ type: 'DEFAULT',
+ href: 'https://eduplay.rnp.br/portal/assets/videos/images/1698243362095.jpg',
+ },
+ ],
+ channels: [
+ {
+ id: 190265,
+ name: 'UnBTV',
+ },
+ ],
+ },
+ {
+ id: 190324,
+ title: 'Esboços: TNHA',
+ description:
+ '
A busca por uma identidade que integre raízes negras, indígenas e latino-americanas cria uma obra que resgata ancestralidade, de olho sempre nas injustiças históricas. Seja espalhando rostos em grafites pelo Distrito Federal para suavizar o caminho de todo dia; seja tatuando ou fazendo ilustrações, TNHA tem um traço singular que carrega todo um aprendizado de andanças por diferentes comunidades e vivências familiares.
',
+ keywords: 'esboços; Tnha; unbtv;',
+ visibility: 'PUBLIC',
+ duration: 1550383,
+ embed:
+ '
',
+ generateLibras: true,
+ generateSubtitle: true,
+ qtAccess: 14,
+ qtLikes: 0,
+ images: [
+ {
+ type: 'DEFAULT',
+ href: 'https://eduplay.rnp.br/portal/assets/videos/images/1698146507222.jpg',
+ },
+ ],
+ channels: [
+ {
+ id: 190265,
+ name: 'UnBTV',
+ },
+ ],
+ },
+];
class VideoServiceMock {
- constructor() { }
- findAll() {
+ getVideosCatalog() {
return of(mockData);
}
}
@@ -239,39 +155,50 @@ describe('VideoComponent', () => {
let component: VideoComponent;
let fixture: ComponentFixture
;
let videoService: VideoService;
+ let router: Router;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [VideoComponent],
imports: [HttpClientTestingModule],
- providers: [{ provide: VideoService, useValue: new VideoServiceMock() }]
- })
- .compileComponents();
+ providers: [{ provide: VideoService, useValue: new VideoServiceMock() }],
+ }).compileComponents();
fixture = TestBed.createComponent(VideoComponent);
component = fixture.componentInstance;
videoService = TestBed.inject(VideoService);
+ router = TestBed.inject(Router);
});
it('should create', () => {
expect(component).toBeTruthy();
});
- it('shoud call findAll', () => {
- spyOn(component, 'findAll');
+ it('should call getVideos ', () => {
+ spyOn(component, 'getVideos');
fixture.detectChanges();
- expect(component.findAll).toHaveBeenCalled();
- })
+ expect(component.getVideos).toHaveBeenCalled();
+ });
- it('should call findAll and return a list of videos', () => {
- const mySpy = spyOn(videoService, 'findAll').and.callThrough();
- component.findAll();
+ it('should call getVideos and return a list of videos', () => {
+ const mySpy = spyOn(component, 'getVideos').and.callThrough();
+ component.getVideos();
expect(mySpy).toHaveBeenCalled();
+ expect(component.unbTvVideos).toEqual(mockData);
});
- it('should call findAll and return an error', () => {
- const mySpy = spyOn(videoService, 'findAll').and.returnValue(throwError(() => new Error('Erro')));
- component.findAll();
+ it('should call getVideos and return an error', () => {
+ const mySpy = spyOn(videoService, 'getVideosCatalog').and.returnValue(
+ throwError(() => new Error('Erro'))
+ );
+ component.getVideos();
+ expect(component.unbTvVideos).toEqual([]);
expect(mySpy).toHaveBeenCalled();
});
+
+ it('should call returnToCatalog when the button is clicked', () => {
+ const navigateSpy = spyOn(router, 'navigate');
+ component.returnToCatalog();
+ expect(navigateSpy).toHaveBeenCalledWith(['/catalog']);
+ });
});
diff --git a/src/app/pages/video/video.component.ts b/src/app/pages/video/video.component.ts
index dcff846d..d7ba5837 100644
--- a/src/app/pages/video/video.component.ts
+++ b/src/app/pages/video/video.component.ts
@@ -1,33 +1,34 @@
import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
import { VideoService } from '../../services/video.service';
import { IVideo } from 'src/shared/model/video.model';
-import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
-import { IEduplayVideosByInstitution } from 'src/shared/model/eduplay-by-institution.model';
@Component({
selector: 'app-video',
templateUrl: './video.component.html',
styleUrls: ['./video.component.css'],
})
-
export class VideoComponent implements OnInit {
- videosEduplay: IVideo[] = [];
+ unbTvVideos: IVideo[] = [];
- constructor(private videoService: VideoService) { }
+ constructor(private videoService: VideoService, private router: Router) {}
ngOnInit(): void {
- this.findAll();
+ this.getVideos();
}
- findAll(): void {
- this.videoService.findAll().subscribe({
- next: (data) => {
- this.videosEduplay = data.body?.videoList || [];
+ getVideos(): void {
+ this.videoService.getVideosCatalog().subscribe({
+ next: (videos) => {
+ this.unbTvVideos = videos;
},
error: (error) => {
- console.log(error);
+ console.error(error);
},
- }
- );
+ });
+ }
+
+ returnToCatalog(): void {
+ this.router.navigate(['/catalog']);
}
}
diff --git a/src/app/services/auth.service.spec.ts b/src/app/services/auth.service.spec.ts
index f5736b2e..83b00de8 100644
--- a/src/app/services/auth.service.spec.ts
+++ b/src/app/services/auth.service.spec.ts
@@ -118,10 +118,24 @@ describe('AuthService', () => {
req.flush(userResponse);
});
+ it('should refresh token', () => {
+ const dummyResponse = { access_token: 'dummyToken' };
+
+ service.refreshToken().subscribe(res => {
+ expect(res).toEqual(dummyResponse);
+ });
+
+ const req = httpMock.expectOne(`${service.usersAPIURL}/auth/refresh`);
+ expect(req.request.method).toBe('POST');
+ req.flush(dummyResponse);
+ });
+
it('should logout', () => {
localStorage.setItem('token', 'testtoken');
+ const navigateSpy = spyOn(service['router'], 'navigate');
service.logout();
expect(localStorage.getItem('token')).toBeNull();
+ expect(navigateSpy).toHaveBeenCalledWith(['/loginsocial']);
});
-
+
});
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index c91004b4..6a2bd524 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -21,6 +21,10 @@ export class AuthService {
return this.http.post(`${this.usersAPIURL}/auth/login`, user);
}
+ loginSocialUser(userSocialData: any): Observable {
+ return this.http.post(`${this.usersAPIURL}/auth/login/social`, userSocialData);
+ }
+
activeAccount(emailCode: any): Observable {
return this.http.patch(`${this.usersAPIURL}/auth/activate-account`, emailCode);
}
@@ -45,9 +49,13 @@ export class AuthService {
const token = localStorage.getItem('token');
return !!token;
}
-
+
+ refreshToken(): Observable {
+ return this.http.post(`${this.usersAPIURL}/auth/refresh`, null);
+ }
+
logout(): void {
localStorage.removeItem('token');
- this.router.navigate(['/login']);
+ this.router.navigate(['/loginsocial']);
}
}
diff --git a/src/app/services/video.service.spec.ts b/src/app/services/video.service.spec.ts
index accb7896..465edd9d 100644
--- a/src/app/services/video.service.spec.ts
+++ b/src/app/services/video.service.spec.ts
@@ -3,9 +3,153 @@ import {
HttpClientTestingModule,
HttpTestingController,
} from '@angular/common/http/testing';
-import { EDUPLAY_API_URL, UNB_ID } from 'src/app/app.constant';
+import {
+ EDUPLAY_API_URL,
+ UNB_ID,
+ VIDEOS_LIMIT,
+ VIDEOS_ORDER,
+} from 'src/app/app.constant';
import { EDUPLAY_CLIENT_KEY } from '../environment/environment';
import { VideoService } from './video.service';
+import { IVideo } from 'src/shared/model/video.model';
+
+const mockData: IVideo[] = [
+ {
+ id: 190985,
+ title: 'Esboços: Luiz Gallina',
+ description:
+ '
A curiosidade de Luiz Gallina em descobrir e entender como mecanismos e processos funcionam dá origem a uma obra composta por gravuras, pinturas e esculturas - abordando temas tão diversos quanto as árvores da paisagem de Brasília, a alquimia e os sonhos colecionados de forma escrita pelo artista durante anos.
',
+ keywords: 'Esboços; Luiz Gallina; UnBTV;',
+ visibility: 'PUBLIC',
+ duration: 1527827,
+ embed:
+ '',
+ generateLibras: true,
+ generateSubtitle: true,
+ qtAccess: 20,
+ qtLikes: 0,
+ images: [
+ {
+ type: 'DEFAULT',
+ href: 'https://eduplay.rnp.br/portal/assets/videos/images/1699445118833.jpg',
+ },
+ ],
+ channels: [
+ {
+ id: 190265,
+ name: 'UnBTV',
+ },
+ ],
+ },
+ {
+ id: 190984,
+ title: 'Esboços: Ricardo Caldeira',
+ description:
+ '
Quando Ricardo Caldeira desenha parece dançar imprimindo na tela um traço marcante que fala sobre afeto, negritude, ancestralidade. Aqui o artista relembra sua infância e adolescência, os primeiros trabalhos e a relação com a região de São Sebastião, local que o influenciou e que hoje ele transforma por meio da participação em coletivos culturais.
',
+ keywords: 'Esboços; Ricardo Caldeira; UnBTV;',
+ visibility: 'PUBLIC',
+ duration: 1525621,
+ embed:
+ '',
+ generateLibras: true,
+ generateSubtitle: true,
+ qtAccess: 14,
+ qtLikes: 0,
+ images: [
+ {
+ type: 'DEFAULT',
+ href: 'https://eduplay.rnp.br/portal/assets/videos/images/1699445004278.jpg',
+ },
+ ],
+ channels: [
+ {
+ id: 190265,
+ name: 'UnBTV',
+ },
+ ],
+ },
+ {
+ id: 190334,
+ title: 'Esboços | Fernanda Pacca',
+ description:
+ '
Confetes, braçadeiras de náilon, botões, linhas de costuras compõe a palheta de cores que constroem surpreendentes figuras humanas na obra de Fernanda Pacca. Trabalhos que impressionam pela forma e abordam diversos temas como o fascínio pelo anatomia, a repressão - tanto estética quanto social - e a violência contra a mulher.
',
+ keywords: 'Fernanda Pacca; Esboços; unbtv;',
+ visibility: 'PUBLIC',
+ duration: 1550174,
+ embed:
+ '',
+ generateLibras: true,
+ generateSubtitle: true,
+ qtAccess: 15,
+ qtLikes: 0,
+ images: [
+ {
+ type: 'DEFAULT',
+ href: 'https://eduplay.rnp.br/portal/assets/videos/images/1698243181940.jpg',
+ },
+ ],
+ channels: [
+ {
+ id: 190265,
+ name: 'UnBTV',
+ },
+ ],
+ },
+ {
+ id: 190333,
+ title: 'Esboços | Valéria Pena-Costa',
+ description:
+ '
Poeira, insetos, objetos em deterioração são, ao mesmo tempo, tema e matéria-prima para a obra de Valéria Pena-Costa em um trabalho que reflete a inevitável passagem do tempo, as memórias de infância, os medos passados e presentes em diferentes formas de expressão.
',
+ keywords: 'Valéria Pena-Costa; Esboços; unbtv;',
+ visibility: 'PUBLIC',
+ duration: 1547193,
+ embed:
+ '',
+ generateLibras: true,
+ generateSubtitle: true,
+ qtAccess: 23,
+ qtLikes: 0,
+ images: [
+ {
+ type: 'DEFAULT',
+ href: 'https://eduplay.rnp.br/portal/assets/videos/images/1698243362095.jpg',
+ },
+ ],
+ channels: [
+ {
+ id: 190265,
+ name: 'UnBTV',
+ },
+ ],
+ },
+ {
+ id: 190324,
+ title: 'Esboços: TNHA',
+ description:
+ '
A busca por uma identidade que integre raízes negras, indígenas e latino-americanas cria uma obra que resgata ancestralidade, de olho sempre nas injustiças históricas. Seja espalhando rostos em grafites pelo Distrito Federal para suavizar o caminho de todo dia; seja tatuando ou fazendo ilustrações, TNHA tem um traço singular que carrega todo um aprendizado de andanças por diferentes comunidades e vivências familiares.
',
+ keywords: 'esboços; Tnha; unbtv;',
+ visibility: 'PUBLIC',
+ duration: 1550383,
+ embed:
+ '',
+ generateLibras: true,
+ generateSubtitle: true,
+ qtAccess: 14,
+ qtLikes: 0,
+ images: [
+ {
+ type: 'DEFAULT',
+ href: 'https://eduplay.rnp.br/portal/assets/videos/images/1698146507222.jpg',
+ },
+ ],
+ channels: [
+ {
+ id: 190265,
+ name: 'UnBTV',
+ },
+ ],
+ },
+];
describe('VideoService', () => {
let service: VideoService;
@@ -269,7 +413,7 @@ describe('VideoService', () => {
});
const req = httpMock.expectOne(
- `${EDUPLAY_API_URL}video?institution=${UNB_ID}`
+ `${EDUPLAY_API_URL}video?institution=${UNB_ID}&limit=${VIDEOS_LIMIT}&order=${VIDEOS_ORDER}`
);
expect(req.request.method).toBe('GET');
expect(req.request.headers.get('clientkey')).toBe(EDUPLAY_CLIENT_KEY);
@@ -331,4 +475,27 @@ describe('VideoService', () => {
req.flush(mockData);
});
});
+
+ describe('setVideosCatalog', () => {
+ it('should set videos catalog', () => {
+ const mockVideos = mockData;
+
+ service.setVideosCatalog(mockVideos);
+
+ service.getVideosCatalog().subscribe((videos) => {
+ expect(videos).toEqual(mockVideos);
+ });
+ });
+ });
+
+ describe('getVideosCatalog', () => {
+ it('should get videos catalog', () => {
+ const mockVideos = mockData;
+ service.setVideosCatalog(mockVideos);
+
+ service.getVideosCatalog().subscribe((videos) => {
+ expect(videos).toEqual(mockVideos);
+ });
+ });
+ });
});
diff --git a/src/app/services/video.service.ts b/src/app/services/video.service.ts
index 896b483b..95b7964c 100644
--- a/src/app/services/video.service.ts
+++ b/src/app/services/video.service.ts
@@ -1,17 +1,19 @@
import { Injectable } from '@angular/core';
import { HttpClient, HttpHeaders, HttpResponse } from '@angular/common/http';
-import { Observable } from 'rxjs';
-import { EDUPLAY_API_URL, UNB_ID } from 'src/app/app.constant';
+import { BehaviorSubject, Observable } from 'rxjs';
+import {
+ EDUPLAY_API_URL,
+ UNB_ID,
+ VIDEOS_LIMIT,
+ VIDEOS_ORDER,
+} from 'src/app/app.constant';
import { IVideo } from 'src/shared/model/video.model';
import { IEduplayVideosByInstitution } from 'src/shared/model/eduplay-by-institution.model';
-import { IVideoVersion } from 'src/shared/model/video-version.model';
import { EDUPLAY_CLIENT_KEY } from '../environment/environment';
type VideoResponseType = HttpResponse;
-type VideoArrayResponseType = HttpResponse;
type EduplayByInstitutionResponseType =
HttpResponse;
-type VideoVersionResponseType = HttpResponse;
@Injectable({
providedIn: 'root',
@@ -20,13 +22,16 @@ export class VideoService {
public resourceUrl = EDUPLAY_API_URL + 'video';
public eduplayClientKey = EDUPLAY_CLIENT_KEY;
public unbId = UNB_ID;
+ public limit = VIDEOS_LIMIT;
+ public order = VIDEOS_ORDER;
+ private selectedCatalogProgram = new BehaviorSubject([]);
constructor(private http: HttpClient) {}
findAll(): Observable {
let headers = new HttpHeaders({ clientkey: this.eduplayClientKey });
return this.http.get(
- `${this.resourceUrl}?institution=${this.unbId}`,
+ `${this.resourceUrl}?institution=${this.unbId}&limit=${this.limit}&order=${this.order}`,
{ headers: headers, observe: 'response' }
);
}
@@ -39,4 +44,12 @@ export class VideoService {
observe: 'response',
});
}
+
+ setVideosCatalog(videos: IVideo[]) {
+ this.selectedCatalogProgram.next(videos);
+ }
+
+ getVideosCatalog(): Observable {
+ return this.selectedCatalogProgram.asObservable();
+ }
}
diff --git a/src/assets/email-svgrepo-com.svg b/src/assets/email-svgrepo-com.svg
new file mode 100644
index 00000000..5fa1e9e3
--- /dev/null
+++ b/src/assets/email-svgrepo-com.svg
@@ -0,0 +1,14 @@
+
+
+
\ No newline at end of file
diff --git a/src/assets/facebook-icon-white-png.png b/src/assets/facebook-icon-white-png.png
new file mode 100644
index 00000000..bade5046
Binary files /dev/null and b/src/assets/facebook-icon-white-png.png differ
diff --git a/src/assets/fonts/Helvetica-Bold.ttf b/src/assets/fonts/Helvetica-Bold.ttf
new file mode 100644
index 00000000..332b66ca
Binary files /dev/null and b/src/assets/fonts/Helvetica-Bold.ttf differ
diff --git a/src/assets/fonts/Helvetica.ttf b/src/assets/fonts/Helvetica.ttf
new file mode 100644
index 00000000..718f22d4
Binary files /dev/null and b/src/assets/fonts/Helvetica.ttf differ
diff --git a/src/assets/imgs/catalog-thumbs/1.Fala-Jovem.jpg b/src/assets/imgs/catalog-thumbs/1.Fala-Jovem.jpg
new file mode 100644
index 00000000..bb8f872a
Binary files /dev/null and b/src/assets/imgs/catalog-thumbs/1.Fala-Jovem.jpg differ
diff --git a/src/assets/imgs/catalog-thumbs/10.Explique-sua-Tese.jpg b/src/assets/imgs/catalog-thumbs/10.Explique-sua-Tese.jpg
new file mode 100644
index 00000000..4a67fb2f
Binary files /dev/null and b/src/assets/imgs/catalog-thumbs/10.Explique-sua-Tese.jpg differ
diff --git a/src/assets/imgs/catalog-thumbs/11.Fazendo-Ciencia-Formando-Cientistas.jpg b/src/assets/imgs/catalog-thumbs/11.Fazendo-Ciencia-Formando-Cientistas.jpg
new file mode 100644
index 00000000..b18c6e0c
Binary files /dev/null and b/src/assets/imgs/catalog-thumbs/11.Fazendo-Ciencia-Formando-Cientistas.jpg differ
diff --git a/src/assets/imgs/catalog-thumbs/12.Radar-da-Extensao.jpg b/src/assets/imgs/catalog-thumbs/12.Radar-da-Extensao.jpg
new file mode 100644
index 00000000..67d62f8e
Binary files /dev/null and b/src/assets/imgs/catalog-thumbs/12.Radar-da-Extensao.jpg differ
diff --git a/src/assets/imgs/catalog-thumbs/13.Se-Liga-no-PAS.jpg b/src/assets/imgs/catalog-thumbs/13.Se-Liga-no-PAS.jpg
new file mode 100644
index 00000000..27857f03
Binary files /dev/null and b/src/assets/imgs/catalog-thumbs/13.Se-Liga-no-PAS.jpg differ
diff --git a/src/assets/imgs/catalog-thumbs/14.UnBTV-Ciencia.png b/src/assets/imgs/catalog-thumbs/14.UnBTV-Ciencia.png
new file mode 100644
index 00000000..21f0bb75
Binary files /dev/null and b/src/assets/imgs/catalog-thumbs/14.UnBTV-Ciencia.png differ
diff --git a/src/assets/imgs/catalog-thumbs/15.Universidade-Para-Que.jpg b/src/assets/imgs/catalog-thumbs/15.Universidade-Para-Que.jpg
new file mode 100644
index 00000000..865b8467
Binary files /dev/null and b/src/assets/imgs/catalog-thumbs/15.Universidade-Para-Que.jpg differ
diff --git a/src/assets/imgs/catalog-thumbs/16.Emcantos.jpg b/src/assets/imgs/catalog-thumbs/16.Emcantos.jpg
new file mode 100644
index 00000000..4c05b48a
Binary files /dev/null and b/src/assets/imgs/catalog-thumbs/16.Emcantos.jpg differ
diff --git a/src/assets/imgs/catalog-thumbs/17.Casa-do-Som.jpg b/src/assets/imgs/catalog-thumbs/17.Casa-do-Som.jpg
new file mode 100644
index 00000000..c7a89779
Binary files /dev/null and b/src/assets/imgs/catalog-thumbs/17.Casa-do-Som.jpg differ
diff --git a/src/assets/imgs/catalog-thumbs/18.Esbocos.jpg b/src/assets/imgs/catalog-thumbs/18.Esbocos.jpg
new file mode 100644
index 00000000..1d24ab45
Binary files /dev/null and b/src/assets/imgs/catalog-thumbs/18.Esbocos.jpg differ
diff --git a/src/assets/imgs/catalog-thumbs/19.Exclusiva.jpg b/src/assets/imgs/catalog-thumbs/19.Exclusiva.jpg
new file mode 100644
index 00000000..41831288
Binary files /dev/null and b/src/assets/imgs/catalog-thumbs/19.Exclusiva.jpg differ
diff --git a/src/assets/imgs/catalog-thumbs/2.Informe-UnB.jpg b/src/assets/imgs/catalog-thumbs/2.Informe-UnB.jpg
new file mode 100644
index 00000000..41404142
Binary files /dev/null and b/src/assets/imgs/catalog-thumbs/2.Informe-UnB.jpg differ
diff --git a/src/assets/imgs/catalog-thumbs/20.Floresta-de-Gente.jpg b/src/assets/imgs/catalog-thumbs/20.Floresta-de-Gente.jpg
new file mode 100644
index 00000000..81a59152
Binary files /dev/null and b/src/assets/imgs/catalog-thumbs/20.Floresta-de-Gente.jpg differ
diff --git a/src/assets/imgs/catalog-thumbs/21.Guia-do-Calouro.jpg b/src/assets/imgs/catalog-thumbs/21.Guia-do-Calouro.jpg
new file mode 100644
index 00000000..9712a530
Binary files /dev/null and b/src/assets/imgs/catalog-thumbs/21.Guia-do-Calouro.jpg differ
diff --git a/src/assets/imgs/catalog-thumbs/22.Memorias-de-Paulo-Freire.jpg b/src/assets/imgs/catalog-thumbs/22.Memorias-de-Paulo-Freire.jpg
new file mode 100644
index 00000000..0e79e803
Binary files /dev/null and b/src/assets/imgs/catalog-thumbs/22.Memorias-de-Paulo-Freire.jpg differ
diff --git a/src/assets/imgs/catalog-thumbs/23.Os-desafios-das-eleicoes2022.jpg b/src/assets/imgs/catalog-thumbs/23.Os-desafios-das-eleicoes2022.jpg
new file mode 100644
index 00000000..dabdaf0a
Binary files /dev/null and b/src/assets/imgs/catalog-thumbs/23.Os-desafios-das-eleicoes2022.jpg differ
diff --git a/src/assets/imgs/catalog-thumbs/24.Podcast-Vida-de-Estudante.jpg b/src/assets/imgs/catalog-thumbs/24.Podcast-Vida-de-Estudante.jpg
new file mode 100644
index 00000000..afd9e8ec
Binary files /dev/null and b/src/assets/imgs/catalog-thumbs/24.Podcast-Vida-de-Estudante.jpg differ
diff --git a/src/assets/imgs/catalog-thumbs/25.Serie-Arquitetura.jpg b/src/assets/imgs/catalog-thumbs/25.Serie-Arquitetura.jpg
new file mode 100644
index 00000000..c28459fb
Binary files /dev/null and b/src/assets/imgs/catalog-thumbs/25.Serie-Arquitetura.jpg differ
diff --git a/src/assets/imgs/catalog-thumbs/26.Mini-Doc.jpg b/src/assets/imgs/catalog-thumbs/26.Mini-Doc.jpg
new file mode 100644
index 00000000..b16679ca
Binary files /dev/null and b/src/assets/imgs/catalog-thumbs/26.Mini-Doc.jpg differ
diff --git a/src/assets/imgs/catalog-thumbs/27.Documentarios.jpg b/src/assets/imgs/catalog-thumbs/27.Documentarios.jpg
new file mode 100644
index 00000000..80537600
Binary files /dev/null and b/src/assets/imgs/catalog-thumbs/27.Documentarios.jpg differ
diff --git a/src/assets/imgs/catalog-thumbs/28.Pitadas-do-Cerrado.jpg b/src/assets/imgs/catalog-thumbs/28.Pitadas-do-Cerrado.jpg
new file mode 100644
index 00000000..a2c5cc36
Binary files /dev/null and b/src/assets/imgs/catalog-thumbs/28.Pitadas-do-Cerrado.jpg differ
diff --git a/src/assets/imgs/catalog-thumbs/3.Zapping.jpg b/src/assets/imgs/catalog-thumbs/3.Zapping.jpg
new file mode 100644
index 00000000..45d61426
Binary files /dev/null and b/src/assets/imgs/catalog-thumbs/3.Zapping.jpg differ
diff --git a/src/assets/imgs/catalog-thumbs/4.Brasil-em-Questao.jpg b/src/assets/imgs/catalog-thumbs/4.Brasil-em-Questao.jpg
new file mode 100644
index 00000000..2053e3f5
Binary files /dev/null and b/src/assets/imgs/catalog-thumbs/4.Brasil-em-Questao.jpg differ
diff --git "a/src/assets/imgs/catalog-thumbs/5.Dia\314\201logos.jpg" "b/src/assets/imgs/catalog-thumbs/5.Dia\314\201logos.jpg"
new file mode 100644
index 00000000..df2be674
Binary files /dev/null and "b/src/assets/imgs/catalog-thumbs/5.Dia\314\201logos.jpg" differ
diff --git a/src/assets/imgs/catalog-thumbs/6.Tirando-de-Letra.jpg b/src/assets/imgs/catalog-thumbs/6.Tirando-de-Letra.jpg
new file mode 100644
index 00000000..eda8be79
Binary files /dev/null and b/src/assets/imgs/catalog-thumbs/6.Tirando-de-Letra.jpg differ
diff --git a/src/assets/imgs/catalog-thumbs/7.UnBTV-Entrevista.jpg b/src/assets/imgs/catalog-thumbs/7.UnBTV-Entrevista.jpg
new file mode 100644
index 00000000..65c387b0
Binary files /dev/null and b/src/assets/imgs/catalog-thumbs/7.UnBTV-Entrevista.jpg differ
diff --git a/src/assets/imgs/catalog-thumbs/8.Vasto-Mundo.jpg b/src/assets/imgs/catalog-thumbs/8.Vasto-Mundo.jpg
new file mode 100644
index 00000000..607d3bc8
Binary files /dev/null and b/src/assets/imgs/catalog-thumbs/8.Vasto-Mundo.jpg differ
diff --git a/src/assets/imgs/catalog-thumbs/9.Vozes-Diplomaticas.jpg b/src/assets/imgs/catalog-thumbs/9.Vozes-Diplomaticas.jpg
new file mode 100644
index 00000000..c7e212bf
Binary files /dev/null and b/src/assets/imgs/catalog-thumbs/9.Vozes-Diplomaticas.jpg differ
diff --git a/src/assets/share.png b/src/assets/share.png
new file mode 100644
index 00000000..65caca70
Binary files /dev/null and b/src/assets/share.png differ
diff --git a/src/shared/model/catalog.model.ts b/src/shared/model/catalog.model.ts
new file mode 100644
index 00000000..d532d81f
--- /dev/null
+++ b/src/shared/model/catalog.model.ts
@@ -0,0 +1,61 @@
+import { IVideo } from './video.model';
+
+export class Catalog {
+ journalism: Journalism = new Journalism();
+ interviews: Interviews = new Interviews();
+ researchAndScience: ResearchAndScience = new ResearchAndScience();
+ artAndCulture: ArtAndCulture = new ArtAndCulture();
+ specialSeries: SpecialSeries = new SpecialSeries();
+ documentaries: Documentaries = new Documentaries();
+ varieties: Varieties = new Varieties();
+ unbtv: IVideo[] = [];
+}
+
+class Journalism {
+ falaJovem: IVideo[] = [];
+ informeUnB: IVideo[] = [];
+ zapping: IVideo[] = [];
+}
+
+class Interviews {
+ brasilEmQuestao: IVideo[] = [];
+ dialogos: IVideo[] = [];
+ tirandoDeLetra: IVideo[] = [];
+ entrevistas: IVideo[] = [];
+ vastoMundo: IVideo[] = [];
+ vozesDiplomaticas: IVideo[] = [];
+}
+
+class ResearchAndScience {
+ expliqueSuaTese: IVideo[] = [];
+ fazendoCiencia: IVideo[] = [];
+ radarDaExtencao: IVideo[] = [];
+ seLigaNoPAS: IVideo[] = [];
+ unbTvCiencia: IVideo[] = [];
+ universidadeParaQue: IVideo[] = [];
+}
+
+class ArtAndCulture {
+ emCantos: IVideo[] = [];
+ casaDoSom: IVideo[] = [];
+ esbocos: IVideo[] = [];
+ exclusiva: IVideo[] = [];
+}
+
+class SpecialSeries {
+ florestaDeGente: IVideo[] = [];
+ guiaDoCalouro: IVideo[] = [];
+ memoriasPauloFreire: IVideo[] = [];
+ desafiosDasEleicoes: IVideo[] = [];
+ vidaDeEstudante: IVideo[] = [];
+ arquiteturaICC: IVideo[] = [];
+}
+
+class Documentaries {
+ miniDoc: IVideo[] = [];
+ documentaries: IVideo[] = [];
+}
+
+class Varieties {
+ pitadasDoCerrado: IVideo[] = [];
+}
diff --git a/src/shared/model/channel.model.ts b/src/shared/model/channel.model.ts
new file mode 100644
index 00000000..382f0623
--- /dev/null
+++ b/src/shared/model/channel.model.ts
@@ -0,0 +1,8 @@
+export interface IChannel {
+ id: number;
+ name: string;
+}
+
+export class Channel implements IChannel {
+ constructor(public id: number, public name: string) {}
+}
diff --git a/src/shared/model/video.model.ts b/src/shared/model/video.model.ts
index de3178a0..d35d3a2d 100644
--- a/src/shared/model/video.model.ts
+++ b/src/shared/model/video.model.ts
@@ -1,33 +1,36 @@
-import { IImage } from "./image.model";
+import { IChannel } from './channel.model';
+import { IImage } from './image.model';
export interface IVideo {
- id?: number;
- title?: string;
- description?: string;
- keywords?: string;
- visibility?: string;
- duration?: number;
- generateLibras?: boolean;
- generateSubtitle?: boolean;
- qtAccess?: number;
- qtLikes?: number;
- images?: IImage[];
- embed?: string;
+ id?: number;
+ title?: string;
+ description?: string;
+ keywords?: string;
+ visibility?: string;
+ duration?: number;
+ generateLibras?: boolean;
+ generateSubtitle?: boolean;
+ qtAccess?: number;
+ qtLikes?: number;
+ images?: IImage[];
+ embed?: string;
+ channels?: IChannel[];
}
export class Video implements IVideo {
- constructor(
- public id?: number,
- public title?: string,
- public description?: string,
- public keywords?: string,
- public visibility?: string,
- public duration?: number,
- public generateLibras?: boolean,
- public generateSubtitle?: boolean,
- public qtAccess?: number,
- public qtLikes?: number,
- public images?: IImage[],
- public embed?: string,
- ) { }
-}
\ No newline at end of file
+ constructor(
+ public id?: number,
+ public title?: string,
+ public description?: string,
+ public keywords?: string,
+ public visibility?: string,
+ public duration?: number,
+ public generateLibras?: boolean,
+ public generateSubtitle?: boolean,
+ public qtAccess?: number,
+ public qtLikes?: number,
+ public images?: IImage[],
+ public embed?: string,
+ public channels?: IChannel[]
+ ) {}
+}
diff --git a/tailwind.config.js b/tailwind.config.js
index 599586eb..bdad8f63 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -7,12 +7,13 @@ module.exports = {
custom: ["unb-pro", "sans-serif"],
},
backgroundColor: {
- 'blue-brand': '#0087C8',
+ "blue-brand": "#0087C8",
},
textColor: {
- 'blue-brand': '#0087C8',
+ "grey-brand": "#3c3c3b",
+ "blue-brand": "#0087C8",
},
},
plugins: [],
- }
-}
+ },
+};
diff --git a/tsconfig.app.json b/tsconfig.app.json
index 374cc9d2..f54aee6e 100644
--- a/tsconfig.app.json
+++ b/tsconfig.app.json
@@ -3,7 +3,7 @@
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "./out-tsc/app",
- "types": []
+ "types": ["gapi", "gapi.auth2"]
},
"files": [
"src/main.ts"
| Ricardo de Castro Loureiro | @castroricardo1 | ricardoloureiro75@gmail.com | 200043111 |
| 
| Sávio Cunha de Carvalho | @savioc2 | saviocunha61@gmail.com | 180130889 |
| 
| Vitória Aquere Matos | @vitoriaaquere | <190096616@aluno.unb.br> | 190096616 |
-
-## Instruções para rodar a aplicação
-
-Instale o docker e docker compose.
-
-Para instalar o docker: https://docs.docker.com/engine/install/
-Para instalar o docker compose: https://docs.docker.com/compose/install/
-
-Para rodar o frontend execute o comando `docker compose up` e abra no navegador usando o link http://localhost:4200/.
-
-Para rodar os testes execute `docker exec -it unb-tv-web ng test` com o docker em execução e abra no navegador usando o link http://localhost:9876/#
-Para rodar o frontend execute o comando `docker compose up`
diff --git a/certificate.cnf b/certificate.cnf
new file mode 100644
index 00000000..1986482b
--- /dev/null
+++ b/certificate.cnf
@@ -0,0 +1,21 @@
+[req]
+default_bits = 2048
+prompt = no
+default_md = sha256
+x509_extensions = v3_req
+distinguished_name = dn
+
+[dn]
+C = IN
+ST = India
+L = India
+O = My Organisation
+OU = My Organisational Unit
+emailAddress = email@domain.com
+CN = localhost
+
+[v3_req]
+subjectAltName = @alt_names
+
+[alt_names]
+DNS.1 = localhost
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 21edd442..9a090329 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,6 +8,7 @@
"name": "unb-tv-frontend",
"version": "0.0.0",
"dependencies": {
+ "@abacritt/angularx-social-login": "^2.0.0",
"@angular/animations": "^15.2.0",
"@angular/cdk": "^15.2.9",
"@angular/common": "^15.2.0",
@@ -18,9 +19,11 @@
"@angular/platform-browser": "^15.2.0",
"@angular/platform-browser-dynamic": "^15.2.0",
"@angular/router": "^15.2.0",
+ "@types/gapi.auth2": "^0.0.60",
"angular-oauth2-oidc": "^15.0.1",
"hls.js": "^1.4.12",
"jwt-decode": "^3.1.2",
+ "ngx-google-analytics": "^14.0.1",
"postcss-cli": "^10.1.0",
"postcss-import": "^15.1.0",
"postcss-loader": "^7.3.3",
@@ -49,6 +52,18 @@
"typescript": "~4.9.4"
}
},
+ "node_modules/@abacritt/angularx-social-login": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/@abacritt/angularx-social-login/-/angularx-social-login-2.0.0.tgz",
+ "integrity": "sha512-SgbkgOTlcbaOmGDL6eCMIXct4+nFpzWjYqUfN7gqyBdb7D/rlo0hDd0hntMqoK5Tc3AA1z2ZAg+fZlSaBuRvEg==",
+ "dependencies": {
+ "tslib": ">=2.5.0"
+ },
+ "peerDependencies": {
+ "@angular/common": ">=15.0.0",
+ "@angular/core": ">=15.0.0"
+ }
+ },
"node_modules/@alloc/quick-lru": {
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz",
@@ -5260,6 +5275,19 @@
"@types/send": "*"
}
},
+ "node_modules/@types/gapi": {
+ "version": "0.0.47",
+ "resolved": "https://registry.npmjs.org/@types/gapi/-/gapi-0.0.47.tgz",
+ "integrity": "sha512-/ZsLuq6BffMgbKMtZyDZ8vwQvTyKhKQ1G2K6VyWCgtHHhfSSXbk4+4JwImZiTjWNXfI2q1ZStAwFFHSkNoTkHA=="
+ },
+ "node_modules/@types/gapi.auth2": {
+ "version": "0.0.60",
+ "resolved": "https://registry.npmjs.org/@types/gapi.auth2/-/gapi.auth2-0.0.60.tgz",
+ "integrity": "sha512-KQiyTHRyAcat6marTRAixrkHhkS7mqclcbQvInfxyp7IeUDSUzLBlgH1s0SFaLl1m1jRY6b+qh4NMlmVm0wPEw==",
+ "dependencies": {
+ "@types/gapi": "*"
+ }
+ },
"node_modules/@types/http-errors": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.2.tgz",
@@ -10274,6 +10302,18 @@
"resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
"integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
},
+ "node_modules/ngx-google-analytics": {
+ "version": "14.0.1",
+ "resolved": "https://registry.npmjs.org/ngx-google-analytics/-/ngx-google-analytics-14.0.1.tgz",
+ "integrity": "sha512-PfOtnshSyq15EKevKlFW9IRgH+dTtPG4Q9HJYksuRNYDzjce0eqK3Bf6hz0tAZdyqbzTCyx5g+NgWBfpqQfb2w==",
+ "dependencies": {
+ "tslib": "^2.4.0"
+ },
+ "peerDependencies": {
+ "@angular/common": ">=12.0.0",
+ "@angular/core": ">=12.0.0"
+ }
+ },
"node_modules/nice-napi": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz",
diff --git a/package.json b/package.json
index 2fe0aef2..0e6b2fef 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
},
"private": true,
"dependencies": {
+ "@abacritt/angularx-social-login": "^2.0.0",
"@angular/animations": "^15.2.0",
"@angular/cdk": "^15.2.9",
"@angular/common": "^15.2.0",
@@ -23,6 +24,7 @@
"@angular/platform-browser": "^15.2.0",
"@angular/platform-browser-dynamic": "^15.2.0",
"@angular/router": "^15.2.0",
+ "@types/gapi.auth2": "^0.0.60",
"angular-oauth2-oidc": "^15.0.1",
"hls.js": "^1.4.12",
"jwt-decode": "^3.1.2",
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 7352b34e..ebc2e5d5 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -16,41 +16,76 @@ import { UpdateRoleComponent } from './pages/update-role/update-role.component';
import { AdminGuard } from './services/admin.guard';
import { SuggestAgendaComponent } from './pages/suggest-agenda/suggest-agenda.component';
import { ParticipateComponent } from './pages/participate/participate.component';
-import { GridDaysComponent } from './pages/grid-days/grid-days.component';
-import { GridComponent } from './pages/grid/grid.component';
+import { GridDaysComponent } from './pages/grid-days/grid-days.component';
+import { GridComponent } from './pages/grid/grid.component';
+import { CatalogComponent } from './pages/catalog/catalog.component';
import { WithTokenGuard } from './guard/with-token.guard';
const routes: Routes = [
- { path: 'login', component: LoginComponent },
- { path: 'register', component: RegisterComponent },
- { path: 'loginsocial', component: LoginSocialComponent },
{ path: 'stream', component: StreamViewComponent },
+ { path: 'catalog', component: CatalogComponent },
{ path: 'videos', component: VideoComponent },
{ path: 'video/:idVideo', component: VideoViewerComponent },
- { path: 'activeAccount', component: ActiveAccountComponent },
- { path: 'sendCodeResetPassword', component: CheckCodeRestPasswordComponent },
- { path: 'changePassword', component: ResetPasswordComponent },
- { path: '', component: VideoComponent, canActivate: [AuthGuard], }, // Default route - Showd be stream component
- { path: 'login', component: LoginComponent, canActivate: [WithTokenGuard], },
- { path: 'register', component: RegisterComponent, canActivate: [WithTokenGuard], },
- { path: 'loginsocial', component: LoginSocialComponent, canActivate: [WithTokenGuard], },
- { path: 'sendCodeResetPassword', component: CheckCodeRestPasswordComponent, canActivate: [WithTokenGuard], },
- { path: 'changePassword', component: ResetPasswordComponent, canActivate: [WithTokenGuard], },
- { path: 'videos', component: VideoComponent, canActivate: [AuthGuard], },
- { path: 'video/:idVideo', component: VideoViewerComponent, canActivate: [AuthGuard], },
- { path: 'activeAccount', component: ActiveAccountComponent, canActivate: [WithTokenGuard], },
- { path: 'suggestAgenda', component: SuggestAgendaComponent, canActivate: [AuthGuard], },
- { path: 'participate', component: ParticipateComponent, canActivate: [AuthGuard], },
- { path: 'profile', component: ProfileComponent, canActivate: [AuthGuard], },
- { path: 'editUser/:id', component: EditUserComponent, canActivate: [AuthGuard], },
+ { path: '', component: CatalogComponent },
+ { path: 'login', component: LoginComponent, canActivate: [WithTokenGuard] },
+ {
+ path: 'register',
+ component: RegisterComponent,
+ canActivate: [WithTokenGuard],
+ },
+ {
+ path: 'loginsocial',
+ component: LoginSocialComponent,
+ canActivate: [WithTokenGuard],
+ },
+ {
+ path: 'sendCodeResetPassword',
+ component: CheckCodeRestPasswordComponent,
+ canActivate: [WithTokenGuard],
+ },
+ {
+ path: 'changePassword',
+ component: ResetPasswordComponent,
+ canActivate: [WithTokenGuard],
+ },
+ {
+ path: 'video/:idVideo',
+ component: VideoViewerComponent,
+ canActivate: [AuthGuard],
+ },
+ {
+ path: 'activeAccount',
+ component: ActiveAccountComponent,
+ canActivate: [WithTokenGuard],
+ },
+ {
+ path: 'suggestAgenda',
+ component: SuggestAgendaComponent,
+ canActivate: [AuthGuard],
+ },
+ {
+ path: 'participate',
+ component: ParticipateComponent,
+ canActivate: [AuthGuard],
+ },
+ { path: 'profile', component: ProfileComponent, canActivate: [AuthGuard] },
+ {
+ path: 'editUser/:id',
+ component: EditUserComponent,
+ canActivate: [AuthGuard],
+ },
{ path: 'grid-days', component: GridDaysComponent },
{ path: 'grid-days/:day', component: GridComponent },
- { path: 'update-role', component: UpdateRoleComponent, canActivate: [AdminGuard], }
+ {
+ path: 'update-role',
+ component: UpdateRoleComponent,
+ canActivate: [AdminGuard],
+ },
];
@NgModule({
imports: [RouterModule.forRoot(routes)],
exports: [RouterModule],
})
-export class AppRoutingModule { }
+export class AppRoutingModule {}
diff --git a/src/app/app.constant.ts b/src/app/app.constant.ts
index ed684343..dad406ae 100644
--- a/src/app/app.constant.ts
+++ b/src/app/app.constant.ts
@@ -1,2 +1,5 @@
export const EDUPLAY_API_URL = 'https://eduplay.rnp.br/services/';
-export const UNB_ID = 216;
\ No newline at end of file
+export const UNB_ID = 216;
+export const VIDEOS_LIMIT = 1000;
+export const VIDEOS_ORDER = 3; // ordenação pelos mais recentes (eduplay);
+export const UNB_TV_CHANNEL_ID = 190265;
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 4dd1beb2..51af47d2 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -11,6 +11,9 @@ import { OAuthModule, OAuthStorage } from 'angular-oauth2-oidc';
import { InputTextModule } from 'primeng/inputtext';
import { DropdownModule } from 'primeng/dropdown';
import { ButtonModule } from 'primeng/button';
+import { SocialLoginModule, SocialAuthServiceConfig } from '@abacritt/angularx-social-login';
+import { GoogleLoginProvider, FacebookLoginProvider } from '@abacritt/angularx-social-login';
+
// Declaration
import { NgModule } from '@angular/core';
@@ -40,6 +43,7 @@ import { GridComponent } from './pages/grid/grid.component';
import { GridDaysComponent } from './pages/grid-days/grid-days.component';
import { ProgressSpinnerModule } from 'primeng/progressspinner';
import { NgxGoogleAnalyticsModule, NgxGoogleAnalyticsRouterModule } from 'ngx-google-analytics';
+import { CatalogComponent } from './pages/catalog/catalog.component';
@NgModule({
imports: [
@@ -58,6 +62,7 @@ import { NgxGoogleAnalyticsModule, NgxGoogleAnalyticsRouterModule } from 'ngx-go
FormsModule,
BrowserAnimationsModule,
MatPaginatorModule,
+ SocialLoginModule,
NgxGoogleAnalyticsModule.forRoot('G-XL7Z0L7VM8'),
NgxGoogleAnalyticsRouterModule
],
@@ -81,7 +86,8 @@ import { NgxGoogleAnalyticsModule, NgxGoogleAnalyticsRouterModule } from 'ngx-go
ParticipateComponent,
GridComponent,
GridDaysComponent,
- VideoCommentComponent
+ VideoCommentComponent,
+ CatalogComponent
],
providers: [
@@ -94,7 +100,28 @@ import { NgxGoogleAnalyticsModule, NgxGoogleAnalyticsRouterModule } from 'ngx-go
},
{ provide: OAuthStorage, useValue: localStorage },
MessageService,
- ConfirmationService
+ ConfirmationService,
+ {
+ provide: 'SocialAuthServiceConfig',
+ useValue: {
+ autoLogin: false,
+ providers: [
+ {
+ id: GoogleLoginProvider.PROVIDER_ID,
+ provider: new GoogleLoginProvider(
+ '254484469180-1imr4ds36p8rq4fe7udkja212tu0p7jl.apps.googleusercontent.com'
+ )
+ },
+ {
+ id: FacebookLoginProvider.PROVIDER_ID,
+ provider: new FacebookLoginProvider('2640880742734858')
+ }
+ ],
+ onError: (err) => {
+ console.error(err);
+ }
+ } as SocialAuthServiceConfig,
+ }
],
bootstrap: [AppComponent],
})
diff --git a/src/app/components/background/background.component.html b/src/app/components/background/background.component.html
index fa449f34..52121646 100644
--- a/src/app/components/background/background.component.html
+++ b/src/app/components/background/background.component.html
@@ -3,63 +3,67 @@
