Merge branch 'fix-ws' into 'master'

Adapt to new ws gateway in proxy

See merge request arsnova/frag.jetzt!306

proxy.conf.json

@@ -31,7 +31,7 @@
     },
 		"logLevel": "debug"
   },
-  "/api/ws": {
+  "/api/ws/websocket": {
     "target": "ws://localhost:8099",
     "secure": false,
     "pathRewrite": {

src/app/rx-stomp.config.ts

@@ -4,7 +4,7 @@ import { environment } from './../environments/environment';
 export const ARSRxStompConfig: RxStompConfig = {
   // Which server?
   brokerURL: (window.location.protocol === 'http:' ) ?
-    `ws://${window.location.hostname}:8080/ws/websocket` : `wss://${window.location.hostname}/api/ws/websocket`,
+    `ws://${window.location.hostname}:/api/ws/websocket` : `wss://${window.location.hostname}/api/ws/websocket`,
 
   connectHeaders: {
     login: 'guest',