kangaroo-and-rabbit/karideo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[DEBUG] last environement for prod that work

Browse Source
This commit is contained in:
Edouard DUPIN 2020-01-06 21:59:47 +01:00
parent 4e041c5bea
commit d4bc5df8c4
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
front/Dockerfile
View File

@ -20,7 +20,7 @@ ENV PATH /application/node_modules/.bin:$PATH
RUN npm install RUN npm install
# generate build # 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 ### ### prod ###

12
front/package-lock.json generated
View File

@ -1388,9 +1388,9 @@
"dev": true "dev": true
}, },
"@types/node": { "@types/node": {
"version": "13.1.2", "version": "13.1.4",
"resolved": "https://registry.npmjs.org/@types/node/-/node-13.1.2.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-13.1.4.tgz",
"integrity": "sha512-B8emQA1qeKerqd1dmIsQYnXi+mmAzTB7flExjmy5X1aVAKFNNNDubkavwR13kR6JnpeLp3aLoJhwn9trWPAyFQ==", "integrity": "sha512-Lue/mlp2egZJoHXZr4LndxDAd7i/7SQYhV0EjWfb/a4/OZ6tuVwMCVPiwkU5nsEipxEf7hmkSU7Em5VQ8P5NGA==",
"dev": true "dev": true
}, },
"@types/q": { "@types/q": {
@ -3266,9 +3266,9 @@
} }
}, },
"core-js": { "core-js": {
"version": "3.6.1", "version": "3.6.2",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.1.tgz", "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.2.tgz",
"integrity": "sha512-186WjSik2iTGfDjfdCZAxv2ormxtKgemjC3SI6PL31qOA0j5LhTDVjHChccoc7brwLvpvLPiMyRlcO88C4l1QQ==" "integrity": "sha512-hIE5dXkRzRvnZ5vhkRfQxUvDxQZmD9oueA08jDYRBKJHx+VIl/Pne/e0A4x9LObEEthC/TqiZybUoNM4tRgnKg=="
}, },
"core-js-compat": { "core-js-compat": {
"version": "3.6.1", "version": "3.6.1",

4
front/package.json
View File

@ -20,7 +20,7 @@
"@angular/platform-browser": "^8.2.14", "@angular/platform-browser": "^8.2.14",
"@angular/platform-browser-dynamic": "^8.2.14", "@angular/platform-browser-dynamic": "^8.2.14",
"@angular/router": "^8.2.14", "@angular/router": "^8.2.14",
"core-js": "^3.6.1", "core-js": "^3.6.2",
"rxjs": "^6.5.4", "rxjs": "^6.5.4",
"tslib": "^1.10.0", "tslib": "^1.10.0",
"zone.js": "~0.9.1" "zone.js": "~0.9.1"
@ -32,7 +32,7 @@
"@angular/language-service": "^8.2.14", "@angular/language-service": "^8.2.14",
"@types/jasmine": "^3.5.0", "@types/jasmine": "^3.5.0",
"@types/jasminewd2": "^2.0.8", "@types/jasminewd2": "^2.0.8",
"@types/node": "^13.1.2", "@types/node": "^13.1.4",
"codelyzer": "^5.0.1", "codelyzer": "^5.0.1",
"jasmine-core": "^3.5.0", "jasmine-core": "^3.5.0",
"jasmine-spec-reporter": "^4.2.1", "jasmine-spec-reporter": "^4.2.1",

6
front/src/app/video-detail/video-detail.component.ts
View File

@ -8,6 +8,7 @@ import { Component, OnInit } from '@angular/core';
import { Router, ActivatedRoute, ParamMap } from '@angular/router'; import { Router, ActivatedRoute, ParamMap } from '@angular/router';
import { Location } from '@angular/common'; import { Location } from '@angular/common';
import { fadeInAnimation } from '../_animations/index'; import { fadeInAnimation } from '../_animations/index';
import { HttpWrapperService } from '../http-wrapper.service';
import { VideoService } from '../video.service'; import { VideoService } from '../video.service';
@ -38,7 +39,8 @@ export class VideoDetailComponent implements OnInit {
constructor(private route: ActivatedRoute, constructor(private route: ActivatedRoute,
private router: Router, private router: Router,
private locate: Location, 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.time = response.time;
self.generated_name = response.generated_name; self.generated_name = response.generated_name;
if (self.data_id != -1) { 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 { } else {
self.video_source = ""; self.video_source = "";
} }