Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
viskin committed Oct 1, 2019
1 parent 1f62353 commit 8255112
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 24 deletions.
4 changes: 1 addition & 3 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
"scripts": {
"server": "cd dist && node server.js",
"serve": "vue-cli-service serve --no-clean",
"build": "vue-cli-service build --mode dev --no-clean",
"buildprod": "vue-cli-service build",
"builddev": "vue-cli-service build --mode dev"
"build": "vue-cli-service build --mode dev --no-clean"
},
"dependencies": {
"@types/socket.io-client": "^1.4.32",
Expand Down
2 changes: 2 additions & 0 deletions app/src/components/StoreTest.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
</b-row>
</b-container>
</template>

<script>
import {EventBus} from '../common/event-bus.js';
import {store} from '../common/store.js';
Expand All @@ -36,6 +37,7 @@ export default {
}
}
</script>

<style>
</style>
2 changes: 1 addition & 1 deletion layout-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"description": "",
"main": "background.js",
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build --mode dev",
"watch": "vue-cli-service build --mode dev --watch",
"prepare": "mklink /j src\\common ..\\app\\src\\common"
Expand All @@ -14,6 +13,7 @@
"@types/socket.io-client": "^1.4.32",
"bootstrap": "^4.3.1",
"bootstrap-vue": "^2.0.2",
"moment": "^2.24.0",
"socket.io": "^2.2.0",
"vue": "^2.6.10",
"webrtc-adapter": "^7.2.3"
Expand Down
18 changes: 0 additions & 18 deletions layout-extension/src/Options2.vue

This file was deleted.

23 changes: 23 additions & 0 deletions layout-extension/src/OptionsApp.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<template>
<div id="app">
<Options></Options>
</div>
</template>

<script>
import moment from 'moment'
import Options from './components/Options.vue'
import HangoutsCaller from './components/HangoutsCaller.vue'
export default {
name: 'app',
components: {
Options,
HangoutsCaller,
}
}
</script>

<style>
</style>
18 changes: 18 additions & 0 deletions layout-extension/src/components/Options.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<template>
<b-container fluid>
<b-button>Button</b-button>
</b-container>
</template>
<script>
import {store} from '../common/store'
export default {
data() {
return {
storeState: store.state,
};
}
}
</script>
<style scoped>
</style>
4 changes: 2 additions & 2 deletions layout-extension/src/options.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import Vue from 'vue'
import BootstrapVue from 'bootstrap-vue'
import options from './Options2.vue'
import optionsApp from './OptionsApp.vue'

import 'bootstrap/dist/css/bootstrap.css'
import 'bootstrap-vue/dist/bootstrap-vue.css'

Vue.use(BootstrapVue);

const app = new Vue({
render: function (h) { return h(options) },
render: function (h) { return h(optionsApp) },
}).$mount('#app');

/** @type HTMLLabelElement */ const switchMode = document.getElementById('switchMode');
Expand Down

0 comments on commit 8255112

Please sign in to comment.