diff --git a/src/app/app.component.html b/src/app/app.component.html index bc0dad0..a169280 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,3 +1,7 @@ + diff --git a/src/app/dedalo.service.ts b/src/app/dedalo.service.ts index 6b79f31..12d5432 100644 --- a/src/app/dedalo.service.ts +++ b/src/app/dedalo.service.ts @@ -8,7 +8,7 @@ import { Entrevistas, Entrevista, ImageDedalo, Informant, Audiovisual} from './e @Injectable() export class DedaloService { - apiUrl : string = "http://api.industriapaisaia.eus/interviews" + apiUrl : string = "https://api.industriapaisaia.eus/interviews" entrevistas : Entrevista[] constructor( @@ -19,7 +19,7 @@ export class DedaloService { return this.http.get(this.apiUrl) .map( (res: Response)=> { //console.log('response :') - console.log(res.json()) + // console.log(res.json()) return res.json() }) } diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index 98c0f4f..4764b1d 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -17,7 +17,7 @@ export class HomeComponent implements OnInit { private pageService: PageService ) { - this.route.params.subscribe( params => console.log(params.id) ); + // this.route.params.subscribe( params => console.log(params.id) ); } ngOnInit() { diff --git a/src/app/interview-grid/interview-grid.component.html b/src/app/interview-grid/interview-grid.component.html index 4098c60..e5aaa5a 100644 --- a/src/app/interview-grid/interview-grid.component.html +++ b/src/app/interview-grid/interview-grid.component.html @@ -7,36 +7,51 @@ --> -
+
-
- -
-

{{entrevista.title}}

-

{{entrevista.date}}

-
{{entrevista.abstract}}
+
+

Entrevistas

+

{{entrevista.title}}

+ +

{{entrevista.abstract}}

+ + +
+
+
+
+ -
    -
  • {{i.surname}}, {{i.name}}
    • -
-
- -
+
+
+ +
+
+
+
-
-
-
-
-

X{{entrevista.title}}

 -
-
-

-
-
+
+
+
+
+
+
+
+ +

{{entrevista.title}}

+

-
+ + +
diff --git a/src/app/interview/interview.component.html b/src/app/interview/interview.component.html index 0545e51..6f2534c 100644 --- a/src/app/interview/interview.component.html +++ b/src/app/interview/interview.component.html @@ -1,19 +1,23 @@ - - + +
+
+
+
+
+
+
+
-
+ -
+
diff --git a/src/app/interview/interview.component.ts b/src/app/interview/interview.component.ts index 8c3559c..0386bd9 100644 --- a/src/app/interview/interview.component.ts +++ b/src/app/interview/interview.component.ts @@ -22,15 +22,6 @@ export class InterviewComponent implements OnInit { private entrevistaService : DedaloService, private route: ActivatedRoute, ) { - let p = new PageItem( - '0', - 'Entrevistas', - 'Una colección de entrevistas', - '', - 'entrevistas', - '0' - ); - this.pages = [p]; this.getEntrevistas() this.route.params.subscribe( params => { this.entrevistaID = params.id @@ -55,8 +46,26 @@ export class InterviewComponent implements OnInit { // }) this.entrevistas = data.result this.entrevistas = this.entrevistas.filter(entrevista => entrevista.lang == 'lg-spa') + + let p = new PageItem( + '0', + 'Entrevistas', + 'Archivo en contrucción de entrevistas realizadas en el proyecto Industria Paisaia', + '', + 'entrevistas', + '0' + ); + p['background_image']="https://backend.industriapaisaia.eus/wp-content/uploads/2018/06/ZM_Made_in_Ormaiztegi_erakusketa_Irati-Otamendi_Hitzaldia-2016_02.jpg" + this.pages = [p]; + + // console.log(this.entrevistas) + // console.log(this.pages) + if (this.entrevistaID) { this.entrevistas = this.entrevistas.filter(entrevista => entrevista.id == this.entrevistaID) + if(this.entrevistas[0].title) { this.pages[0].title = this.entrevistas[0].title; } + if(this.entrevistas[0].abstract) { this.pages[0].excerpt = this.entrevistas[0].abstract; } + if(this.entrevistas[0].image) { this.pages[0].background_image = "http://dedalo.anorgatarrak.eus"+this.entrevistas[0].image[0].src; } } }) } diff --git a/src/app/page/page.component.html b/src/app/page/page.component.html index d0832a3..76babe9 100644 --- a/src/app/page/page.component.html +++ b/src/app/page/page.component.html @@ -1,8 +1,12 @@ -
+ +
+
+
+
diff --git a/src/styles.css b/src/styles.css index 96b0419..7bb3a1e 100644 --- a/src/styles.css +++ b/src/styles.css @@ -17,7 +17,7 @@ body { font-family:"Raleway",serif; overflow-x:hidden;background:#efefef;margin:0; font-size:14pt;font-size:1rem;} h1,h2 { font-family: "Oswald", sans-serif; text-transform:uppercase; font-weight:bold;} -app-home header { overflow:hidden; width:100%;height:100%;height:100vh;text-align:center;position:relative;} +app-home header { overflow:hidden; width:100%;height:100%;height:98vh;text-align:center;position:relative;} header.homepage { background:url('./assets/industria-paisaia.svg'); background-size:contain; background-repeat:no-repeat; background-position:center center;} @@ -98,14 +98,16 @@ footer.single { min-height:100px; height:100%; margin-top:30px; padding:20px; co /* item continaer */ .item-container {width:27%;margin:15px 15px 25px 15px;float:left;padding:0px; border:0px solid #E12323;trans ition:1s;} .item-container:hover {transform:translateY(-5px);} -.item-container h3 {font-family:"Raleway";text-transform:uppercase;color:#f7886c; margin-bottom:0; font-size:0.8em; text-align:right;padding:2px;cursor:pointer;} +.item-container h3 {font-family:"Raleway";text-transform:uppercase;color:#000; margin-bottom:0; font-size:0.8em; text-align:right;padding:2px;cursor:pointer;} .item-container h3::after {content:'';} .item-container h2 {font-size:2em; text-align:center;padding:2px;} -.item-container h2.thumbtitle {position:relative;width:100%;text-align:center;padding-top:15%;} -.item-container .thumbnail-image { transition:2s;padding:5px; min-height:150px;background:#fff; background-size:cover; background-size:120%; } +.item-container h2 a { color:#f7886c;} +.item-container h2.thumbtitle {position:relative;width:100%;text-align:center;} +.item-container .thumbnail-image { transition:2s;padding:5px; min-height:150px;background:#fff; background-size:cover; background-size:120%; background-repeat:no-repeat;} .item-container .thumbnail-image.last { background:#E12323;color:#fff; } .item-container .thumbnail-image a, -.item-container .thumbnail-image h2 {color:#000;transition:1s;transform-origin:left;text-align:left;} +.item-container .thumbnail-image h2 {color:#d2e8eb;transition:1s;transform-origin:left;text-align:left;} +.item-container .thumbnail-image h2 a {color:#d2e8eb; } .item-container .thumbnail-image:hover { background-position:-10%;cursor:pointer; } .item-container .thumbnail-image:hover > a, .item-container .thumbnail-image:hover h2 { opacity:1;transform:rotate(5deg); } @@ -132,8 +134,8 @@ header.item { margin-top:50px;height:0;} .arrow-down:hover { transform:scale(1.5); margin-top:20px;} /* barra lateral item / media */ -.info h1 {margin:20px auto;} -.info h1 span {background-color:#d2e8eb;padding:5px;} +.info h1 {margin:20px auto; word-wrap:break-word;} +.info h1 span {line-height: 1.8; background-color:#d2e8eb;padding:5px;} .info h2 {color:#f7886c;} .info ul.filters {list-style:none; margin:0;padding:0; margin-bottom:50px;} .info ul.filters li { word-wrap:break-word; cursor:pointer; border-right:5px solid #f7886c; padding:5px 30px; text-transform:uppercase;font-family:"Raleway";text-align:right;} @@ -198,6 +200,16 @@ ks-current-image img { filter:none; } } } +/* loading block */ +div.loading-block {width:100%;} +div.loading-block div.progress-bar-load { width:0%; height:10px; background:#f7886c;animation: expand 1s ease infinite;} +div.loading-block div.progress-bar-load.blue {background:#d2e8eb;animation: expand 10s ease infinite;} + +@keyframes expand { + 0% { width:0%; } + 100% {width:100%; } +} + @media (max-width:480px) { div.menu { position:relative;} div.menu * { width:100%;background:#fff; }