+
-
diff --git a/src/components/NavbarService.vue b/src/components/NavbarService.vue
new file mode 100644
index 0000000..8aebac7
--- /dev/null
+++ b/src/components/NavbarService.vue
@@ -0,0 +1,29 @@
+
+
+ {{name}} #{{port}}
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/Packet.vue b/src/components/Packet.vue
deleted file mode 100644
index ea297ec..0000000
--- a/src/components/Packet.vue
+++ /dev/null
@@ -1,97 +0,0 @@
-
-
-
#{{id}} at {{new Date(timestamp).toLocaleDateString('ru-RU', {month: '2-digit', day: '2-digit', hour:'2-digit', minute: '2-digit', second: '2-digit'})}}
-
-
-
-
-
-
-
-
diff --git a/src/components/SettingsModal.vue b/src/components/SettingsModal.vue
deleted file mode 100644
index 52fa217..0000000
--- a/src/components/SettingsModal.vue
+++ /dev/null
@@ -1,147 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index ba0a615..749a1c3 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -1,222 +1,117 @@
-
-
diff --git a/src/components/SidebarStream.vue b/src/components/SidebarStream.vue
new file mode 100644
index 0000000..aed1589
--- /dev/null
+++ b/src/components/SidebarStream.vue
@@ -0,0 +1,23 @@
+
+
+ Huh?!
+
+
+
+
+
+
diff --git a/src/components/Stream.vue b/src/components/Stream.vue
deleted file mode 100644
index c50afd6..0000000
--- a/src/components/Stream.vue
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-
-
- #{{id}} {{proto}} TTL {{ttl}}
- {{new Date(startTime).toLocaleDateString('ru-RU', {month: '2-digit', day: '2-digit', hour:'2-digit', minute: '2-digit', second: '2-digit'})}}
- - {{new Date(endTime).toLocaleTimeString('ru-RU', {hour:'2-digit', minute: '2-digit', second: '2-digit'})}}
-
- {{pattern.name}}
-
-
-
-
-
-
-
-
diff --git a/src/main.js b/src/main.js
index 123c93a..d6ae916 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,17 +1,50 @@
-import Vue from 'vue'
-import App from './App.vue'
-import router from './router'
-import store from './store'
-import 'bootstrap';
-import 'bootstrap/dist/css/bootstrap.min.css'
+import Vue from 'vue';
+import BootstrapVue from 'bootstrap-vue';
+import Axios from 'axios';
+import InfiniteLoading from 'vue-infinite-loading';
+import App from './App.vue';
+import router from './router';
+
+import store from './store';
+import 'bootstrap/dist/css/bootstrap.css';
+import 'bootstrap-vue/dist/bootstrap-vue.css';
+import '@fortawesome/fontawesome-free/css/all.css';
Vue.config.productionTip = false;
+Vue.use(BootstrapVue);
+Vue.use(InfiniteLoading, {
+ slots: {
+ 'no-results': 'Нет результатов...',
+ 'no-more': 'Данных больше нет',
+ error: 'Произошла ошибка!',
+ errorBtnText: 'Повторить',
+ },
+ props: {
+ spinner: 'waveDots',
+ },
+});
+const axiosInstance = Axios.create({
+ // baseURL: '/api', // TODO: edit for release!
+ baseURL: 'http://192.168.79.131:8080/api',
+ auth: {
+ username: store.state.apiLogin,
+ password: store.state.apiPassword,
+ },
+ headers: {
+ 'Accept': 'application/json',
+ 'Content-Type': 'application/json',
+ },
+ timeout: 3000,
+ withCredentials: true,
+ maxContentLength: 20000,
+});
+// noinspection JSUnusedGlobalSymbols
+Vue.prototype.$http = axiosInstance;
+
+// noinspection JSUnusedGlobalSymbols
new Vue({
router,
store,
render: h => h(App),
}).$mount('#app');
-
-
-// TODO: вынести наконец инстанс axios сюда!
diff --git a/src/router.js b/src/router.js
index 56c5582..4a03c6d 100644
--- a/src/router.js
+++ b/src/router.js
@@ -1,16 +1,32 @@
-import Vue from 'vue'
-import Router from 'vue-router'
-import Home from './views/Home.vue'
+import Vue from 'vue';
+import Router from 'vue-router';
+import ContentStream from './views/ContentStream';
+import Sidebar from './components/Sidebar';
Vue.use(Router);
export default new Router({
routes: [
+ // {
+ // path: '/',
+ // name: 'nothing',
+ // component: ContentNothing,
+ // },
{
path: '/:servicePort?/:streamId?',
- name: 'home',
- component: Home,
+ name: 'stream',
props: true,
+ // route level code-splitting
+ // this generates a separate chunk (about.[hash].js) for this route
+ // which is lazy-loaded when the route is visited.
+ // component: () => import(/* webpackChunkName: "stream" */ './views/ContentStream'),
+
+ // component: ContentStream,
+ components: {
+ sidebar: Sidebar,
+ content: ContentStream,
+ },
},
],
-})
+ linkActiveClass: 'active',
+});
diff --git a/src/store.js b/src/store.js
index 1d0f938..3a514e2 100644
--- a/src/store.js
+++ b/src/store.js
@@ -1,27 +1,38 @@
-import Vue from 'vue'
-import Vuex from 'vuex'
-import createPersistedState from 'vuex-persistedstate'
+import Vue from 'vue';
+import Vuex from 'vuex';
+import createMutationsSharer from 'vuex-shared-mutations';
+import createPersistedState from 'vuex-persistedstate';
Vue.use(Vuex);
+// noinspection JSUnusedLocalSymbols,JSUnusedGlobalSymbols
export default new Vuex.Store({
state: {
- apiUrl: 'http://127.0.0.1/api',
apiLogin: 'BinaryBears',
apiPassword: '123456',
hexdumpBlockSize: 16,
hexdumpLineNumberBase: 10,
pageSize: 25,
- displayFavOnly: false,
+ displayFavoritesOnly: false,
},
mutations: {
- setApiUrl: (state, payload) => state.apiUrl = payload,
- setApiLogin: (state, payload) => state.apiLogin = payload,
- setApiPassword: (state, payload) => state.apiPassword = payload,
- setHexdumpBlockSize: (state, payload) => state.hexdumpBlockSize = payload,
- setHexdumpLineNumberBase: (state, payload) => state.hexdumpLineNumberBase = payload,
- setPageSize: (state, payload) => state.pageSize = payload,
- setDisplayFavOnly: (state, payload) => state.displayFavOnly = payload,
+ setApiLogin: (s, p) => s.apiLogin = p,
+ setApiPassword: (s, p) => s.apiPassword = p,
+ setHexdumpBlockSize: (s, p) => s.hexdumpBlockSize = p,
+ setHexdumpLineNumberBase: (s, p) => s.hexdumpLineNumberBase = p,
+ setPageSize: (s, p) => s.pageSize = p,
+ // eslint-disable-next-line no-unused-vars
+ toggleDisplayFavoritesOnly: (s, p) => s.displayFavoritesOnly = !s.displayFavoritesOnly,
},
- plugins: [createPersistedState(),],
-})
+ actions: {},
+ plugins: [
+ createPersistedState(),
+ createMutationsSharer({
+ // eslint-disable-next-line no-unused-vars
+ predicate: (mutation, state) => {
+ console.debug('Got mutation:', mutation);
+ return mutation?.type !== 'setDisplayFavoritesOnly';
+ },
+ }),
+ ],
+});
diff --git a/src/views/ContentStream.vue b/src/views/ContentStream.vue
new file mode 100644
index 0000000..a2caa2b
--- /dev/null
+++ b/src/views/ContentStream.vue
@@ -0,0 +1,16 @@
+
+
+ Some stream #{{ streamId }} at port #{{ servicePort }}
+
+
+
+
+
+
diff --git a/src/views/Home.vue b/src/views/Home.vue
deleted file mode 100644
index c4cfba0..0000000
--- a/src/views/Home.vue
+++ /dev/null
@@ -1,114 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
new file mode 100644
index 0000000..e51dbad
--- /dev/null
+++ b/src/views/Settings.vue
@@ -0,0 +1,102 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vue.config.js b/vue.config.js
index d5ed00c..bad7220 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,3 +1,3 @@
module.exports = {
- publicPath: '',
+ lintOnSave: false,
};