Skip to content

Commit 6ba20d9

Browse files
authored
Merge branch 'dev' into dependabot/npm_and_yarn/electron/dev/globals-17.2.0
2 parents 78a5e09 + 6314033 commit 6ba20d9

32 files changed

+7970
-1083
lines changed

client/package-lock.json

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
"lodash": "4.17.23",
4242
"loglevel": "1.9.2",
4343
"marked": "11.2.0",
44+
"splitpanes": "^2.4.1",
4445
"vue": "2.7.14",
4546
"vue-multiselect": "2.1.9",
4647
"vue-native-websocket": "2.0.15",

client/src/App.vue

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,17 @@
6060
>
6161
Jump To Page
6262
</b-dropdown-item>
63+
<b-dropdown-item-btn
64+
:disabled="
65+
CURRENT_SHOW_SESSION == null ||
66+
!WEBSOCKET_HEALTHY ||
67+
stoppingSession ||
68+
startingSession
69+
"
70+
@click.stop.prevent="SET_STAGE_MANAGER_MODE(!STAGE_MANAGER_MODE)"
71+
>
72+
{{ STAGE_MANAGER_MODE ? 'Disable' : 'Enable' }} Stage Manager
73+
</b-dropdown-item-btn>
6374
</b-nav-item-dropdown>
6475
</template>
6576
<b-nav-item
@@ -162,7 +173,7 @@
162173
</template>
163174

164175
<script>
165-
import { mapGetters, mapActions } from 'vuex';
176+
import { mapGetters, mapActions, mapMutations } from 'vuex';
166177
import log from 'loglevel';
167178
import CreateUser from '@/vue_components/user/CreateUser.vue';
168179
import { makeURL } from '@/js/utils';
@@ -227,6 +238,7 @@ export default {
227238
'IS_SCRIPT_EDITOR',
228239
'IS_CUE_READER',
229240
'IS_CUE_EDITOR',
241+
'STAGE_MANAGER_MODE',
230242
]),
231243
},
232244
async created() {
@@ -285,6 +297,7 @@ export default {
285297
'CHECK_WEBSOCKET_STATE',
286298
'GET_USER_SETTINGS',
287299
]),
300+
...mapMutations(['SET_STAGE_MANAGER_MODE']),
288301
isElectron,
289302
async switchServer() {
290303
// Clear the active connection and disconnect WebSocket

client/src/assets/styles/dark.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,11 @@
1010
:root {
1111
--body-background: #{$body-bg};
1212
}
13+
14+
.splitpanes {
15+
background: inherit !important;
16+
}
17+
18+
.splitpanes__pane {
19+
background: inherit !important;
20+
}

client/src/main.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { BootstrapVue, IconsPlugin } from 'bootstrap-vue';
55
import Vuelidate from 'vuelidate';
66
import ToastPlugin from 'vue-toast-notification';
77
import Multiselect from 'vue-multiselect';
8+
import { Splitpanes, Pane } from 'splitpanes';
89

910
import store from '@/store/store';
1011
import App from './App.vue';
@@ -15,12 +16,15 @@ import { getWebSocketURL, isElectron } from '@/js/platform';
1516
import './assets/styles/dark.scss';
1617
import 'vue-toast-notification/dist/theme-sugar.css';
1718
import 'vue-multiselect/dist/vue-multiselect.min.css';
19+
import 'splitpanes/dist/splitpanes.css';
1820

1921
setupHttpInterceptor();
2022

2123
Vue.use(BootstrapVue);
2224
Vue.use(IconsPlugin);
2325
Vue.component('MultiSelect', Multiselect);
26+
Vue.component('SplitPanes', Splitpanes);
27+
Vue.component('SplitPane', Pane);
2428

2529
Vue.use(Vuex);
2630
Vue.use(Vuelidate);

client/src/router/index.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@ const routes = [
4646
component: () => import('../views/show/config/ConfigCast.vue'),
4747
meta: { requiresAuth: true, requiresShowAccess: true },
4848
},
49+
{
50+
name: 'show-config-stage',
51+
path: 'stage',
52+
component: () => import('../views/show/config/ConfigStage.vue'),
53+
meta: { requiresAuth: true, requiresShowAccess: true },
54+
},
4955
{
5056
name: 'show-config-characters',
5157
path: 'characters',

client/src/store/modules/show.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ export default {
2121
noLeaderToast: null,
2222
scriptModes: [],
2323
sessionTags: [],
24+
stageManagerMode: false,
2425
},
2526
mutations: {
2627
SET_CAST_LIST(state, castList) {
@@ -75,6 +76,9 @@ export default {
7576
SET_SESSION_TAGS(state, tags) {
7677
state.sessionTags = tags;
7778
},
79+
SET_STAGE_MANAGER_MODE(state, enabled) {
80+
state.stageManagerMode = enabled;
81+
},
7882
},
7983
actions: {
8084
async GET_CAST_LIST(context) {
@@ -862,5 +866,8 @@ export default {
862866
}
863867
return null;
864868
},
869+
STAGE_MANAGER_MODE(state) {
870+
return state.stageManagerMode;
871+
},
865872
},
866873
};

0 commit comments

Comments
 (0)