mirror of
https://github.com/fergalmoran/podnoms.git
synced 2025-12-22 09:18:08 +00:00
Docker fixes and prod bug removal
This commit is contained in:
Fergal Moran
@@ -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": [
|
||||
|
||||
@@ -1,78 +1,78 @@
|
||||
{
|
||||
"name": "pod-noms.web",
|
||||
"version": "0.21.0",
|
||||
"license": "MIT",
|
||||
"scripts": {
|
||||
"ng": "ng",
|
||||
"start": "ng serve --aot",
|
||||
"build": "ng build",
|
||||
"test": "ng test",
|
||||
"lint": "ng lint"
|
||||
},
|
||||
"ngrxGen": {
|
||||
"basePath": "./src/app",
|
||||
"seperateDirectory": true
|
||||
},
|
||||
"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",
|
||||
"@ngrx/effects": "^5.1.0",
|
||||
"@ngrx/store": "^5.1.0",
|
||||
"@ngrx/store-devtools": "^5.1.0",
|
||||
"@qontu/ngx-inline-editor": "^0.2.0-alpha.12",
|
||||
"angular2-jwt": "^0.2.3",
|
||||
"angular2-moment": "^1.8.0",
|
||||
"angularfire2": "^5.0.0-rc.6",
|
||||
"applicationinsights-js": "^1.0.15",
|
||||
"auth0": "^2.9.1",
|
||||
"auth0-lock": "^11.4.0",
|
||||
"bootstrap": "4.0.0",
|
||||
"core-js": "^2.5.3",
|
||||
"dropzone": "^5.3.0",
|
||||
"firebase": "^4.12.0",
|
||||
"font-awesome": "^4.7.0",
|
||||
"jquery": "^3.3.1",
|
||||
"lodash": "^4.17.5",
|
||||
"ng2-toasty": "^4.0.3",
|
||||
"ngx-bootstrap": "^2.0.3",
|
||||
"ngx-clipboard": "^10.0.0",
|
||||
"ngx-moment": "^2.0.0-rc.0",
|
||||
"popper.js": "^1.13.0",
|
||||
"rxjs": "5.5.6",
|
||||
"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/compiler-cli": "^5.2.6",
|
||||
"@angular/language-service": "^5.2.6",
|
||||
"@types/applicationinsights-js": "^1.0.5",
|
||||
"@types/jasmine": "^2.8.6",
|
||||
"@types/node": "~9.4.6",
|
||||
"codelyzer": "^4.2.1",
|
||||
"jasmine-core": "~2.99.1",
|
||||
"jasmine-spec-reporter": "~4.2.1",
|
||||
"karma": "~2.0.0",
|
||||
"karma-chrome-launcher": "~2.2.0",
|
||||
"karma-cli": "~1.0.1",
|
||||
"karma-coverage-istanbul-reporter": "^1.4.1",
|
||||
"karma-jasmine": "^1.1.1",
|
||||
"karma-jasmine-html-reporter": "^0.2.2",
|
||||
"protractor": "~5.3.0",
|
||||
"ts-node": "^5.0.1",
|
||||
"tslint": "~5.9.1",
|
||||
"typescript": "~2.5.3"
|
||||
}
|
||||
"name": "pod-noms.web",
|
||||
"version": "0.21.0",
|
||||
"license": "MIT",
|
||||
"scripts": {
|
||||
"ng": "ng",
|
||||
"start": "ng serve --aot",
|
||||
"build": "ng build",
|
||||
"test": "ng test",
|
||||
"lint": "ng lint"
|
||||
},
|
||||
"ngrxGen": {
|
||||
"basePath": "./src/app",
|
||||
"seperateDirectory": true
|
||||
},
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@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",
|
||||
"@qontu/ngx-inline-editor": "^0.2.0-alpha.12",
|
||||
"angular2-jwt": "^0.2.3",
|
||||
"angular2-moment": "^1.8.0",
|
||||
"angularfire2": "^5.0.0-rc.6",
|
||||
"applicationinsights-js": "^1.0.15",
|
||||
"auth0": "^2.9.1",
|
||||
"auth0-lock": "^11.4.0",
|
||||
"bootstrap": "4.1.0",
|
||||
"core-js": "^2.5.3",
|
||||
"dropzone": "^5.3.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.4",
|
||||
"ngx-clipboard": "^10.0.0",
|
||||
"ngx-moment": "^2.0.0-rc.0",
|
||||
"popper.js": "^1.13.0",
|
||||
"rxjs": "5.5.6",
|
||||
"simple-line-icons": "^2.4.1",
|
||||
"tether": "^1.4.3",
|
||||
"uglify-es": "^3.3.10",
|
||||
"zone.js": "^0.8.20"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@angular/cli": "1.7.4",
|
||||
"@angular/compiler-cli": "^5.2.6",
|
||||
"@angular/language-service": "^5.2.6",
|
||||
"@types/applicationinsights-js": "^1.0.5",
|
||||
"@types/jasmine": "^2.8.6",
|
||||
"@types/node": "~9.4.6",
|
||||
"codelyzer": "^4.2.1",
|
||||
"jasmine-core": "~2.99.1",
|
||||
"jasmine-spec-reporter": "~4.2.1",
|
||||
"karma": "~2.0.0",
|
||||
"karma-chrome-launcher": "~2.2.0",
|
||||
"karma-cli": "~1.0.1",
|
||||
"karma-coverage-istanbul-reporter": "^1.4.1",
|
||||
"karma-jasmine": "^1.1.1",
|
||||
"karma-jasmine-html-reporter": "^0.2.2",
|
||||
"protractor": "~5.3.0",
|
||||
"ts-node": "^5.0.1",
|
||||
"tslint": "~5.9.1",
|
||||
"typescript": "~2.5.3"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -18,6 +18,7 @@ export class DebugComponent implements OnInit {
|
||||
|
||||
debugInfo$: Observable<string>;
|
||||
apiHost = environment.API_HOST;
|
||||
signalrHost = environment.SIGNALR_HOST;
|
||||
pingPong = '';
|
||||
|
||||
constructor(
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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
0
server/publish.sh
Normal file → Executable file
Reference in New Issue
Block a user