From 8255112d6df38a4043f4c2a9347cf6b2719fc7ca Mon Sep 17 00:00:00 2001
From: viskin <r.viskin@terikon.com>
Date: Tue, 1 Oct 2019 18:32:56 +0300
Subject: [PATCH] fixes

---
 app/package.json                            |  4 +---
 app/src/components/StoreTest.vue            |  2 ++
 layout-extension/package.json               |  2 +-
 layout-extension/src/Options2.vue           | 18 ----------------
 layout-extension/src/OptionsApp.vue         | 23 +++++++++++++++++++++
 layout-extension/src/components/Options.vue | 18 ++++++++++++++++
 layout-extension/src/options.js             |  4 ++--
 7 files changed, 47 insertions(+), 24 deletions(-)
 delete mode 100644 layout-extension/src/Options2.vue
 create mode 100644 layout-extension/src/OptionsApp.vue
 create mode 100644 layout-extension/src/components/Options.vue

diff --git a/app/package.json b/app/package.json
index f1f3e49..e6885a6 100644
--- a/app/package.json
+++ b/app/package.json
@@ -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",
diff --git a/app/src/components/StoreTest.vue b/app/src/components/StoreTest.vue
index 8ea9333..520c371 100644
--- a/app/src/components/StoreTest.vue
+++ b/app/src/components/StoreTest.vue
@@ -12,6 +12,7 @@
   </b-row>
 </b-container>
 </template>
+
 <script>
 import {EventBus} from '../common/event-bus.js';
 import {store} from '../common/store.js';
@@ -36,6 +37,7 @@ export default {
   }
 }
 </script>
+
 <style>
 
 </style>
diff --git a/layout-extension/package.json b/layout-extension/package.json
index f698980..c760fdf 100644
--- a/layout-extension/package.json
+++ b/layout-extension/package.json
@@ -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"
@@ -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"
diff --git a/layout-extension/src/Options2.vue b/layout-extension/src/Options2.vue
deleted file mode 100644
index b3ff389..0000000
--- a/layout-extension/src/Options2.vue
+++ /dev/null
@@ -1,18 +0,0 @@
-<template>
-
-</template>
-
-<script>
-import moment from 'moment'
-
-export default {
-  name: 'app',
-  components: {
-    HangoutsCaller
-  }
-}
-
-</script>
-
-<style>
-</style>
diff --git a/layout-extension/src/OptionsApp.vue b/layout-extension/src/OptionsApp.vue
new file mode 100644
index 0000000..f78d924
--- /dev/null
+++ b/layout-extension/src/OptionsApp.vue
@@ -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>
diff --git a/layout-extension/src/components/Options.vue b/layout-extension/src/components/Options.vue
new file mode 100644
index 0000000..14143f0
--- /dev/null
+++ b/layout-extension/src/components/Options.vue
@@ -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>
diff --git a/layout-extension/src/options.js b/layout-extension/src/options.js
index 23f6628..e4369eb 100644
--- a/layout-extension/src/options.js
+++ b/layout-extension/src/options.js
@@ -1,6 +1,6 @@
 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'
@@ -8,7 +8,7 @@ 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');