aran/seepur
1
0
Fork 0
forked from sagi/seepur
Code Issues Pull requests Releases Wiki Activity

Trying to fix ws issue

Browse source
This commit is contained in:
Sagi Dayan 2020-05-01 14:32:29 -04:00
parent 6bbff50996
commit a6e15d6b64
8 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/scripts/applications/admin/app.bundle.js
View file

File diff suppressed because one or more lines are too long

6
public/scripts/applications/home/app.bundle.js
View file

File diff suppressed because one or more lines are too long

2
public/scripts/components/navbar/app.bundle.js
View file

File diff suppressed because one or more lines are too long

2
public/scripts/views/register/app.bundle.js
View file

File diff suppressed because one or more lines are too long

6
public/style.css
View file

@ -6858,11 +6858,7 @@ label.panel-block {
margin: -.8em auto; }
.is-fullheight {
min-height: calc(100vh - ( 3.25rem ));
max-height: calc(100vh - ( 3.25rem ));
height: calc(100vh - ( 3.25rem )); }
.is-fullheight .column {
overflow-y: auto; }
min-height: calc(100vh - ( 3.25rem )); }
.is-fullwidth {
width: 100vw;

10
resources/sass/main.scss
View file

@ -128,11 +128,11 @@ $sizes: (
.is-fullheight{
min-height: calc(100vh - ( #{$navbar-height} ) );
max-height: calc(100vh - ( #{$navbar-height} ) );
height: calc(100vh - ( #{$navbar-height} ) );
.column{
overflow-y: auto;
}
// max-height: calc(100vh - ( #{$navbar-height} ) );
// height: calc(100vh - ( #{$navbar-height} ) );
// .column{
// overflow-y: auto;
// }
}
.is-fullwidth{

2
resources/scripts/applications/home/app.vue
View file

@ -1,7 +1,7 @@
<template>
<div class="app">
<!-- <Header :appName="appName" /> -->
<TopNavbar />
<TopNavbar :ws="this.ws" />
<div class="loading" v-if="loading">
<Loading />
</div>

4
resources/scripts/applications/shared/components/TopNavbar.vue
View file

@ -105,12 +105,12 @@ import WebsocketService from "../../home/ws/websocket.service";
import Modal from "../../shared/components/Modal/Modal.vue";
export default {
name: "TobNavbar",
props: ["ws"],
components: {
Modal
},
async created() {
const ws = await WebsocketService.getInstance();
this.callManager = ws.callManager;
this.callManager = this.ws.callManager;
},
updated() {
if (!this.inCall) {