Docker fixes and prod bug removal

This commit is contained in:
Fergal Moran
2018-04-21 00:24:07 +01:00
parent a75b418cd1
commit cfb2dc968d
7 changed files with 93 additions and 80 deletions

View File

@@ -23,7 +23,6 @@
"styles": [
"../node_modules/font-awesome/css/font-awesome.css",
"../node_modules/simple-line-icons/css/simple-line-icons.css",
"../node_modules/jplayer/dist/skin/blue.monday/css/jplayer.blue.monday.css",
"styles.css"
],
"scripts": [

View File

@@ -15,16 +15,16 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^5.2.7",
"@angular/common": "^5.2.7",
"@angular/compiler": "^5.2.7",
"@angular/core": "^5.2.7",
"@angular/forms": "^5.2.7",
"@angular/http": "^5.2.7",
"@angular/platform-browser": "^5.2.7",
"@angular/platform-browser-dynamic": "^5.2.7",
"@angular/router": "^5.2.7",
"@aspnet/signalr": "^1.0.0-preview3-30392",
"@angular/animations": "^5.2.10",
"@angular/common": "^5.2.10",
"@angular/compiler": "^5.2.10",
"@angular/core": "^5.2.10",
"@angular/forms": "^5.2.10",
"@angular/http": "^5.2.10",
"@angular/platform-browser": "^5.2.10",
"@angular/platform-browser-dynamic": "^5.2.10",
"@angular/router": "^5.2.10",
"@aspnet/signalr": "1.0.0-rc1-30631",
"@ngrx/effects": "^5.1.0",
"@ngrx/store": "^5.1.0",
"@ngrx/store-devtools": "^5.1.0",
@@ -35,15 +35,16 @@
"applicationinsights-js": "^1.0.15",
"auth0": "^2.9.1",
"auth0-lock": "^11.4.0",
"bootstrap": "4.0.0",
"bootstrap": "4.1.0",
"core-js": "^2.5.3",
"dropzone": "^5.3.0",
"firebase": "^4.12.0",
"firebase": "^4.13.1",
"font-awesome": "^4.7.0",
"howler": "^2.0.9",
"jquery": "^3.3.1",
"lodash": "^4.17.5",
"ng2-toasty": "^4.0.3",
"ngx-bootstrap": "^2.0.3",
"ngx-bootstrap": "^2.0.4",
"ngx-clipboard": "^10.0.0",
"ngx-moment": "^2.0.0-rc.0",
"popper.js": "^1.13.0",
@@ -51,11 +52,10 @@
"simple-line-icons": "^2.4.1",
"tether": "^1.4.3",
"uglify-es": "^3.3.10",
"yarn": "^1.5.1",
"zone.js": "^0.8.20"
},
"devDependencies": {
"@angular/cli": "1.6.8",
"@angular/cli": "1.7.4",
"@angular/compiler-cli": "^5.2.6",
"@angular/language-service": "^5.2.6",
"@types/applicationinsights-js": "^1.0.5",

View File

@@ -26,7 +26,7 @@
<div class="block-content">
<div class="row">
API Host: {{apiHost}}
<br /> SignalR Host: {{signalrHost}}
<br /> SignalR Hos: {{signalrHost}}
<br /> Ping: {{pingPong}}
</div>
<div class="row">

View File

@@ -18,6 +18,7 @@ export class DebugComponent implements OnInit {
debugInfo$: Observable<string>;
apiHost = environment.API_HOST;
signalrHost = environment.SIGNALR_HOST;
pingPong = '';
constructor(

View File

@@ -1,6 +1,11 @@
import { AuthService } from './auth.service';
import { Injectable } from '@angular/core';
import { HubConnection } from '@aspnet/signalr';
import {
HubConnection,
HubConnectionBuilder,
JsonHubProtocol,
LogLevel
} from '@aspnet/signalr';
import { environment } from 'environments/environment';
@Injectable()
@@ -15,7 +20,12 @@ export class SignalRService {
const options: any = {
transport: 0
};
this.connection = new HubConnection(url + '?token=' + token, options);
this.connection = new HubConnectionBuilder()
.configureLogging(LogLevel.Trace)
.withUrl(url + '?token=' + token, options)
.withHubProtocol(new JsonHubProtocol())
.build();
return this.connection.start();
}
}

View File

@@ -23,6 +23,9 @@ server {
if ($ssl_protocol = "") {
rewrite ^((?!/rss/).) https://$server_name$request_uri? permanent;
}
location ~* \.(eot|otf|ttf|woff|woff2)$ {
root /usr/share/nginx/html;
}
location /assets/ {
alias /usr/share/nginx/html/;
}

0
server/publish.sh Normal file → Executable file
View File