summaryrefslogtreecommitdiff
path: root/src/web
diff options
context:
space:
mode:
Diffstat (limited to 'src/web')
-rw-r--r--src/web/src/app/film/film.component.html15
-rw-r--r--src/web/src/app/film/film.component.ts47
-rw-r--r--src/web/src/app/home/home.component.html5
-rw-r--r--src/web/src/app/scrape.service.spec.ts16
-rw-r--r--src/web/src/app/scrape.service.ts17
-rw-r--r--src/web/src/assets/img/platforms/googleplay.pngbin1900 -> 0 bytes
-rw-r--r--src/web/src/assets/img/platforms/googleplaymovies&tv.pngbin0 -> 7071 bytes
-rw-r--r--src/web/src/assets/img/platforms/itunes.pngbin2495 -> 76794 bytes
-rw-r--r--src/web/src/assets/img/platforms/youtube.pngbin872 -> 8085 bytes
-rw-r--r--src/web/src/assets/movies pic.svg (renamed from src/web/src/assets/movies.svg)0
-rw-r--r--src/web/src/styles.css8
11 files changed, 77 insertions, 31 deletions
diff --git a/src/web/src/app/film/film.component.html b/src/web/src/app/film/film.component.html
index 7e18536..0619f72 100644
--- a/src/web/src/app/film/film.component.html
+++ b/src/web/src/app/film/film.component.html
@@ -36,14 +36,23 @@
Watch It Here
</h1>
<div class="cards-list pt-4">
- <div class="card">
+ <div
+ class="card"
+ *ngFor="let item of providers; let i = index"
+ >
<div class="card-img">
<img
class="p-3"
- src="https://iconape.com/wp-content/png_logo_vector/google-play-movies-tv.png"
+ [src]="
+ '../../assets/img/platforms/' +
+ getProviderImage(i) +
+ '.png'
+ "
/>
</div>
- <div class="card_title"></div>
+ <div class="card_title title-white">
+ {{ getPrice(i) }}
+ </div>
</div>
</div>
</div>
diff --git a/src/web/src/app/film/film.component.ts b/src/web/src/app/film/film.component.ts
index d4e90f5..26dd507 100644
--- a/src/web/src/app/film/film.component.ts
+++ b/src/web/src/app/film/film.component.ts
@@ -3,6 +3,7 @@ import { ActivatedRoute } from '@angular/router';
import { filter, map } from 'rxjs/operators';
import { MovieTVService } from '../movie-tv.service';
import { AppService } from '../app.service';
+import { ScrapeService } from '../scrape.service';
@Component({
selector: 'app-film',
@@ -10,43 +11,37 @@ import { AppService } from '../app.service';
styleUrls: ['./film.component.css'],
})
export class FilmComponent implements OnInit {
- providers = ['Netflix'];
+ providers;
model: any;
loading: boolean = true;
img: string;
type: string;
id: string;
+ prices;
constructor(
private route: ActivatedRoute,
- private service: MovieTVService
+ private service: MovieTVService,
+ private scraper: ScrapeService
) {}
ngOnInit(): void {
this.route.paramMap.subscribe((x) => {
this.type = x.get('type');
this.id = x.get('id');
- //Start Scraping and loading the spinner
-
- //this.data.getUsers().subscribe((data) => {
- // this.users = data;
- //});
- ///
});
this.service.searchById(this.type, +this.id).subscribe((x: any) => {
+ let a;
this.model = x;
- this.loading = false;
- console.log(this.model);
+ if (this.type === 'tv') {
+ a = this.model.name;
+ } else {
+ a = this.model.original_title;
+ }
+ this.scraper.performCheck(this.id, a, this.type).subscribe((x) => {
+ this.providers = x[0];
+ this.prices = x[1];
+ this.loading = false;
+ });
});
- //
- //Get Providers List
- /*this.service
- .getProviderList(this.model.media_type, this.model.id)
- .pipe(
- map((x: any) => {
- x.results.US.flatrate;
- })
- )
- .subscribe((x) => (this.model.watch_providers = x));
- console.log(this.model.watch_providers);*/
}
getImage() {
@@ -54,4 +49,14 @@ export class FilmComponent implements OnInit {
? 'https://image.tmdb.org/t/p/original' + this.model.poster_path
: '';
}
+ getPrice(i: number) {
+ return this.prices[i];
+ }
+
+ getProviderImage(i: number) {
+ console.log(
+ (this.providers[i] as string).toLowerCase().replace(/ /g, '')
+ );
+ return (this.providers[i] as string).toLowerCase().replace(/ /g, '');
+ }
}
diff --git a/src/web/src/app/home/home.component.html b/src/web/src/app/home/home.component.html
index 7e59fe0..88dd292 100644
--- a/src/web/src/app/home/home.component.html
+++ b/src/web/src/app/home/home.component.html
@@ -2,7 +2,10 @@
<div class="row h-100">
<div class="offset-lg-1 offset-xs-2 mt-5 col-lg-10 col-xs-8">
<app-search-bar></app-search-bar>
- <img src="../../assets/movies.svg" class="cover-img img-fluid" />
+ <img
+ src="../../assets/movies pic.svg"
+ class="cover-img img-fluid"
+ />
</div>
</div>
</div>
diff --git a/src/web/src/app/scrape.service.spec.ts b/src/web/src/app/scrape.service.spec.ts
new file mode 100644
index 0000000..45c2849
--- /dev/null
+++ b/src/web/src/app/scrape.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { ScrapeService } from './scrape.service';
+
+describe('ScrapeService', () => {
+ let service: ScrapeService;
+
+ beforeEach(() => {
+ TestBed.configureTestingModule({});
+ service = TestBed.inject(ScrapeService);
+ });
+
+ it('should be created', () => {
+ expect(service).toBeTruthy();
+ });
+});
diff --git a/src/web/src/app/scrape.service.ts b/src/web/src/app/scrape.service.ts
new file mode 100644
index 0000000..fa25601
--- /dev/null
+++ b/src/web/src/app/scrape.service.ts
@@ -0,0 +1,17 @@
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+
+@Injectable({
+ providedIn: 'root',
+})
+export class ScrapeService {
+ apiURL = 'http://localhost:5000/api/';
+
+ constructor(private service: HttpClient) {}
+
+ performCheck(id, query, type) {
+ return this.service.get(this.apiURL + 'performCheck', {
+ params: { id: id, query: query, type: type },
+ });
+ }
+}
diff --git a/src/web/src/assets/img/platforms/googleplay.png b/src/web/src/assets/img/platforms/googleplay.png
deleted file mode 100644
index a44a779..0000000
--- a/src/web/src/assets/img/platforms/googleplay.png
+++ /dev/null
Binary files differ
diff --git a/src/web/src/assets/img/platforms/googleplaymovies&tv.png b/src/web/src/assets/img/platforms/googleplaymovies&tv.png
new file mode 100644
index 0000000..1262012
--- /dev/null
+++ b/src/web/src/assets/img/platforms/googleplaymovies&tv.png
Binary files differ
diff --git a/src/web/src/assets/img/platforms/itunes.png b/src/web/src/assets/img/platforms/itunes.png
index 3c0acb5..8d0c18e 100644
--- a/src/web/src/assets/img/platforms/itunes.png
+++ b/src/web/src/assets/img/platforms/itunes.png
Binary files differ
diff --git a/src/web/src/assets/img/platforms/youtube.png b/src/web/src/assets/img/platforms/youtube.png
index 15d5984..36248e4 100644
--- a/src/web/src/assets/img/platforms/youtube.png
+++ b/src/web/src/assets/img/platforms/youtube.png
Binary files differ
diff --git a/src/web/src/assets/movies.svg b/src/web/src/assets/movies pic.svg
index 0f5cc91..0f5cc91 100644
--- a/src/web/src/assets/movies.svg
+++ b/src/web/src/assets/movies pic.svg
diff --git a/src/web/src/styles.css b/src/web/src/styles.css
index f52e2e7..5aedd08 100644
--- a/src/web/src/styles.css
+++ b/src/web/src/styles.css
@@ -100,6 +100,7 @@ body {
height: 120px;
box-shadow: 3px 3px 15px 5px rgba(0, 0, 0, 0.3);
transition: 0.3s;
+ margin: 20px auto;
}
.card .card-img {
@@ -120,8 +121,7 @@ body {
border-radius: 0px 0px 40px 40px;
font-family: sans-serif;
font-weight: bold;
- font-size: 30px;
- margin-top: -80px;
+ font-size: 20px;
height: 40px;
}
@@ -134,10 +134,6 @@ body {
color: white;
}
-.title-black {
- color: black;
-}
-
@media all and (max-width: 500px) {
.card-list {
/* On small screens, we are no longer using row direction but column */