fixy wixy teh fucksey upsy

pull/3895/head
tidusjar 5 years ago
parent eceab97b65
commit df022b4863

@ -29,7 +29,9 @@
"node_modules/angular-bootstrap-md/scss/mdb-free.scss",
"node_modules/pace/themes/orange/pace-theme-flat-top.css",
"node_modules/font-awesome/scss/font-awesome.scss",
"node_modules/primeng/resources/primeng.min.css"
"node_modules/primeng/resources/primeng.min.css",
"node_modules/primeng/resources/themes/nova-light/theme.css",
"node_modules/primeicons/primeicons.css"
],
"scripts": [
"node_modules/jquery/dist/jquery.min.js",

@ -53,7 +53,8 @@
"ngx-page-scroll": "^5.0.1",
"pace": "github:HubSpot/pace#v1.0.2",
"popper.js": "^1.14.3",
"primeng": "^7.1.0",
"primeng": "^7.0.3",
"primeicons": "^1.0.0",
"rxjs": "^6.0.0",
"socket.io-client": "^2.2.0",
"store": "^2.0.12",
@ -78,4 +79,4 @@
"ts-node": "~5.0.1",
"tslint": "^5.12.0"
}
}
}

@ -184,13 +184,13 @@
<div class="col-12 col-md-9">
<mat-card class="card-full mat-elevation-z8">
<mat-card-header>Cast</mat-card-header>
<mat-card-header>Cast</mat-card-header>
<mat-card-content>
<p-carousel [value]="movie.credits.cast" [numVisible]="5" easing="easeOutStrong">
<ng-template let-item pTemplate="item">
<div class="row justify-content-md-center">
<div class="col-12">
<img width="150px" *ngIf="item.profile_path"
<img class="cast-profile-img" *ngIf="item.profile_path"
src="https://image.tmdb.org/t/p/w300/{{item.profile_path}}">
<!-- TODO get profile image default -->
</div>
@ -206,7 +206,11 @@
</mat-card-content>
</mat-card>
</div>
<!-- <div class="col-12 col-md-9">
</div>
<div class="row card-spacer media-row">
<div class="col-12 col-md-3"></div>
<div class="col-12 col-md-9">
<mat-accordion>
<mat-expansion-panel>
<mat-expansion-panel-header>
@ -272,11 +276,15 @@
</div>
</mat-expansion-panel>
</mat-accordion>
</div> -->
</div>
</div>
</div>
< </div> </div> <div class="bottom-page-gap">
</div>
<div class="bottom-page-gap">
</div>
</section>

@ -155,7 +155,7 @@ section {
}
.btn-spacing {
margin-right:10px;
margin-right:10px !important;
}
.btn-spacing-below {
@ -189,19 +189,8 @@ section {
}
.cast-profile-img {
width: 65px;
border-radius: 25%;
}
.cast-names {
margin-left:0;
}
.cast-name {
padding-top:15%;
}
.cast-row {
margin-top: 10%;
border-radius: 10%;
width: 170px;
}
.small-middle-container{
@ -211,4 +200,5 @@ section {
.keywords-panel {
margin-top: 8%;
}
}

@ -1,4 +1,4 @@
import { Component } from "@angular/core";
import { Component, ViewEncapsulation } from "@angular/core";
import { ImageService, SearchV2Service, RequestService, NotificationService, MessageService } from "../services";
import { ActivatedRoute } from "@angular/router";
import { DomSanitizer } from "@angular/platform-browser";
@ -15,9 +15,9 @@ export class MovieDetailsComponent {
private theMovidDbId: number;
constructor(private searchService: SearchV2Service, private route: ActivatedRoute,
private sanitizer: DomSanitizer, private imageService: ImageService,
public dialog: MatDialog, private requestService: RequestService,
public messageService: MessageService) {
private sanitizer: DomSanitizer, private imageService: ImageService,
public dialog: MatDialog, private requestService: RequestService,
public messageService: MessageService) {
this.route.params.subscribe((params: any) => {
this.theMovidDbId = params.movieDbId;
this.load();
@ -25,19 +25,19 @@ export class MovieDetailsComponent {
}
public load() {
this.searchService.getFullMovieDetails(this.theMovidDbId).subscribe(x => {
this.movie = x;
this.searchService.getFullMovieDetails(this.theMovidDbId).subscribe(x => {
this.movie = x;
this.imageService.getMovieBanner(this.theMovidDbId.toString()).subscribe(x => {
this.movie.background = this.sanitizer.bypassSecurityTrustStyle
("url(" + x + ")");
("url(" + x + ")");
});
});
}
public async request() {
var result = await this.requestService.requestMovie({theMovieDbId: this.theMovidDbId, languageCode: null}).toPromise();
if(result.result) {
var result = await this.requestService.requestMovie({ theMovieDbId: this.theMovidDbId, languageCode: null }).toPromise();
if (result.result) {
this.movie.requested = true;
this.messageService.send(result.message, "Ok");
} else {
@ -47,8 +47,8 @@ export class MovieDetailsComponent {
public openDialog() {
this.dialog.open(MovieDetailsTrailerComponent, {
width: '560px',
data: this.movie
width: '560px',
data: this.movie
});
}
}
}

@ -6,7 +6,7 @@
<script>
const existingBaseUrl = window.localStorage.getItem("baseUrl");
if (existingBaseUrl === null || existingBaseUrl || existingBaseUrl.length === 0) {
if (existingBaseUrl && existingBaseUrl.length === 0) {
document.write('<base href="/' + existingBaseUrl + '" />');
if (existingBaseUrl.length === 0) {
document.write("<link rel=\"stylesheet\" href='/loading.css'/>")
@ -30,7 +30,6 @@
}
const data = JSON.parse(xmlhttp.responseText);
hasFile = true;
debugger;
document.write('<base href="/' + data + '" />');
document.write("<link rel=\"stylesheet\" href=" + data + "/loading.css\"/>")
window.localStorage.setItem("baseUrl", data);

@ -1,3 +1,4 @@
@import "./styles.scss";
@import "./shared.scss";
@import "./buttons.scss";
@import "./buttons.scss";
@import "./primeng-overrides.scss"

@ -0,0 +1,16 @@
// PrimeNG Carosel overrides
.ui-carousel-dropdown {
display:none;
}
.ui-carousel .ui-carousel-viewport .ui-carousel-items .ui-carousel-item {
border: 0 !important;
}
.ui-carousel-viewport {
border:0 !important;
}
.ui-carousel .ui-carousel-header {
background-color:transparent !important;
border: 0 !important;
}

@ -4749,6 +4749,11 @@ preserve@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
primeicons@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/primeicons/-/primeicons-1.0.0.tgz#90061f168ef6227f21f0a7db8204ffa85cd27aec"
integrity sha512-p/hzIjUVccW4eJPhuORHI3AUkDpqfvCQVrjxbFEejnTEdWY4C8fomVfjiaA9jCu83fSQnBHuRIGB96iAR8R6uA==
primeng@^7.0.3:
version "7.0.4"
resolved "https://registry.yarnpkg.com/primeng/-/primeng-7.0.4.tgz#4aee9b0dfd61d23f474f80e420f4375be583abc9"

Loading…
Cancel
Save