diff --git a/front/Dockerfile b/front/Dockerfile index c9e962e..7694406 100644 --- a/front/Dockerfile +++ b/front/Dockerfile @@ -20,7 +20,7 @@ ENV PATH /application/node_modules/.bin:$PATH RUN npm install # generate build -RUN ng build --output-path=dist --configuration=production --deploy-url=/karideo/ +RUN ng build --output-path=dist --configuration=production --base-href=/karideo/ --deploy-url=/karideo/ ############ ### prod ### diff --git a/front/package-lock.json b/front/package-lock.json index 7ed90b1..09bb459 100644 --- a/front/package-lock.json +++ b/front/package-lock.json @@ -1388,9 +1388,9 @@ "dev": true }, "@types/node": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.1.2.tgz", - "integrity": "sha512-B8emQA1qeKerqd1dmIsQYnXi+mmAzTB7flExjmy5X1aVAKFNNNDubkavwR13kR6JnpeLp3aLoJhwn9trWPAyFQ==", + "version": "13.1.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-13.1.4.tgz", + "integrity": "sha512-Lue/mlp2egZJoHXZr4LndxDAd7i/7SQYhV0EjWfb/a4/OZ6tuVwMCVPiwkU5nsEipxEf7hmkSU7Em5VQ8P5NGA==", "dev": true }, "@types/q": { @@ -3266,9 +3266,9 @@ } }, "core-js": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.1.tgz", - "integrity": "sha512-186WjSik2iTGfDjfdCZAxv2ormxtKgemjC3SI6PL31qOA0j5LhTDVjHChccoc7brwLvpvLPiMyRlcO88C4l1QQ==" + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.2.tgz", + "integrity": "sha512-hIE5dXkRzRvnZ5vhkRfQxUvDxQZmD9oueA08jDYRBKJHx+VIl/Pne/e0A4x9LObEEthC/TqiZybUoNM4tRgnKg==" }, "core-js-compat": { "version": "3.6.1", diff --git a/front/package.json b/front/package.json index 3550da9..fb0405d 100644 --- a/front/package.json +++ b/front/package.json @@ -20,7 +20,7 @@ "@angular/platform-browser": "^8.2.14", "@angular/platform-browser-dynamic": "^8.2.14", "@angular/router": "^8.2.14", - "core-js": "^3.6.1", + "core-js": "^3.6.2", "rxjs": "^6.5.4", "tslib": "^1.10.0", "zone.js": "~0.9.1" @@ -32,7 +32,7 @@ "@angular/language-service": "^8.2.14", "@types/jasmine": "^3.5.0", "@types/jasminewd2": "^2.0.8", - "@types/node": "^13.1.2", + "@types/node": "^13.1.4", "codelyzer": "^5.0.1", "jasmine-core": "^3.5.0", "jasmine-spec-reporter": "^4.2.1", diff --git a/front/src/app/video-detail/video-detail.component.ts b/front/src/app/video-detail/video-detail.component.ts index 54eb410..0d8275a 100644 --- a/front/src/app/video-detail/video-detail.component.ts +++ b/front/src/app/video-detail/video-detail.component.ts @@ -8,6 +8,7 @@ import { Component, OnInit } from '@angular/core'; import { Router, ActivatedRoute, ParamMap } from '@angular/router'; import { Location } from '@angular/common'; import { fadeInAnimation } from '../_animations/index'; +import { HttpWrapperService } from '../http-wrapper.service'; import { VideoService } from '../video.service'; @@ -38,7 +39,8 @@ export class VideoDetailComponent implements OnInit { constructor(private route: ActivatedRoute, private router: Router, private locate: Location, - private videoService: VideoService) { + private videoService: VideoService, + private httpService: HttpWrapperService) { } @@ -58,7 +60,7 @@ export class VideoDetailComponent implements OnInit { self.time = response.time; self.generated_name = response.generated_name; if (self.data_id != -1) { - self.video_source = "http://localhost:15080/data/" + self.data_id; + self.video_source = self.httpService.createRESTCall("data/" + self.data_id); } else { self.video_source = ""; }