Compare commits

...

2 Commits

Author SHA1 Message Date
Siroco
38f7991a0c Fix Dec 2020 2020-12-14 19:19:37 +01:00
Siroco
3fbc153804 Revisión Diciembre: botón reame and other fixes 2020-12-13 12:46:53 +01:00
8 changed files with 43 additions and 14 deletions

View File

@ -5,9 +5,10 @@ import { InitComponent} from './init/init.component';
const routes: Routes = [
{ path: '404', redirectTo:'/home'},
{ path: ':name', component: SlideComponent },
{ path: '', redirectTo: '/home', pathMatch: 'full'}
// { path: '', component: InitComponent }
{ path: '', redirectTo: '/home', pathMatch: 'full'},
{ path: '**', redirectTo: '/home' }
];
@NgModule({

View File

@ -2,6 +2,8 @@ import { Injectable } from '@angular/core';
import { HttpClient,HttpResponse } from '@angular/common/http';
import { Observable } from 'rxjs';
import {environment} from '../environments/environment';
import { ActivatedRoute, Router } from '@angular/router';
@Injectable({
providedIn: 'root'
@ -10,7 +12,10 @@ export class ClientService {
apiUrl:string
constructor(private http: HttpClient) {
constructor(
private http: HttpClient,
private router: Router
) {
this.apiUrl = environment.uriAPI
}
@ -23,9 +28,7 @@ export class ClientService {
}
getItem(name:string) : Observable<any> {
return this.http.get<any>(
this.apiUrl+'/items/'+name+'/index.json', {}
)
return this.http.get<any>(this.apiUrl+'/items/'+name+'/index.json', {})
}
}

View File

@ -153,6 +153,10 @@ export class PlayerService {
if (this.audio.muted) { this.audio.muted=false } else { this.audio.muted=true}
}
unmute() {
this.audio.muted=false;
}
onProgress() {
var duration = this.audio.duration;
if (duration > 0) {

View File

@ -53,7 +53,7 @@
<div class="element">
<!-- <h1 routerLink="home" style="cursor:pointer">Beire</h1> -->
<!-- <h2>Un propuesta de Maite Redondo y Luca Rullo</h2> -->
<!-- <div class="round-button" title="Pulsa para iniciar" routerLink="home" (click)="play()"></div> -->
<div class="round-button init-title" title="Pulsa para iniciar" (click)="forcePlay()" style="">ENTRAR</div>
<!-- <h3>Con la ayuda de Pedro, María, Luis, Nombre, Nombre, Nombre, Nombre, Nombre, Nombre, Nombre, Nombre, Nombre, Nombre, Nombre, Nombre, Nombre, Nombre, Nombre, Nombre, Nombre, Nombre, Nombre, Nombre, Nombre,Nombre, Nombre, Nombre, Nombre, Nombre, Nombre, Nombre, Nombre, Nombre, Nombre, Nombre, Nombre, Nombre, Nombre, Nombre, Nombre, Nombre, Nombre </h3> -->
</div>
</div>

View File

@ -33,6 +33,10 @@ div.element {
text-align:justify;
}
div.init-title {
text-align:center;font-size:8vw;font-size:calc(12px + 2vw);cursor:pointer;background:transparent;color:#fff;padding-top:5px;font-family:'Frutiger';
}
div.big-title {
font-weight: bold;
font-family:"Helvetica Bold",sans-serif;
@ -113,6 +117,8 @@ div.footer {
div.footer.right {
left:auto;
right:0;
margin-left:0;
margin-right:5vw;
}
div.menu {
z-index:200;cursor:pointer;left:auto;

View File

@ -64,7 +64,12 @@ export class SlideComponent implements OnInit {
params => {
if (params.name) {
this.clientService.getItem(params.name).subscribe(
(r) => { this.slide = r.data;}
(r) => {
this.slide = r.data;
},
(error) => {
this.router.navigate(['404'])
}
)
}
}
@ -95,14 +100,14 @@ export class SlideComponent implements OnInit {
}
);
this.videoPlayer.on('ended', () => { this.stopVideo(); });
this.videoPlayer.on('fullscreenchange', (data) => { if (!data.fullscreen) { this.stopVideo(); } })
this.videoPlayer.on('fullscreenchange', (data) => { console.log(data.fullscreen); if (!data.fullscreen) { this.stopVideo(); this.forceUnmute(); } })
}
stopVideo() {
this.videoPlayer.pause().then( () => {
this.mute(); //unmute
this.showVideo = "none";
});
this.showVideo = "none";
this.mute(); //unmute
this.videoPlayer.pause();
//.then( () => {});
}
getFeaturedImage(): string {
@ -136,6 +141,11 @@ export class SlideComponent implements OnInit {
up(e) { if (this.slide.n) this.router.navigate(['/', this.slide.n]); }
down(e) { if (this.slide.s) this.router.navigate(['/', this.slide.s]); }
forceUnmute() {
this.muted = false;
this.playerService.unmute();
}
mute() {
this.playerService.mute();
this.muted = !this.muted;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 MiB

After

Width:  |  Height:  |  Size: 6.5 MiB

View File

@ -2,6 +2,11 @@
{"title":"Traktorea", "url":"https://www.soinumapa.net/wp-content/uploads/2020/10/20201017_TRACTOR_ARANDO.mp3"},
{"title":"Kanpaiak", "url":"https://www.soinumapa.net/wp-content/uploads/2020/10/20201017_BEIRE_CAMPANAS_EDIT.mp3"},
{"title":"Erlezaintza", "url":"https://www.soinumapa.net/wp-content/uploads/2020/10/20200909_ABEJAS_COMER_APICULTOR_DIA_BEIRE_ARGUEDAS.mp3"},
{"title":"Uxue Santutegia", "url":"https://www.soinumapa.net/wp-content/uploads/2020/10/20200912_INTERIOR_IGLESIA_PUERTA_UJUE_EDITED.mp3"}
{"title":"Uxue Santutegia", "url":"https://www.soinumapa.net/wp-content/uploads/2020/10/20200912_INTERIOR_IGLESIA_PUERTA_UJUE_EDITED.mp3"},
{"title":"Artzaina", "url":"http://www.soinumapa.net/wp-content/uploads/2020/10/20201001_PASTOR_LLAMA_OVEJAS_BEIRE_EDITED.mp3"},
{"title":"Kilkerrak", "url":"http://www.soinumapa.net/wp-content/uploads/2020/10/20200911_GRILLOS_BEIRE_NOCHE.mp3"},
{"title":"Tren geltokian", "url":"http://www.soinumapa.net/wp-content/uploads/2020/10/20200911_TREN_ESPERANDO_BEIRE_DIA.mp3"},
{"title":"Improvisaciones musicales - Violín", "url":"http://lrullo.audio-lab.org/files/2020/12/MUSICA_VIOLIN.mp3"},
{"title":"Improvisaciones musicales - Acordeón", "url":"http://lrullo.audio-lab.org/files/2020/12/MUSICA_ACORDEON.mp3"}
]
}