From 2653f896f2fcf7425a2f89093483ad23af95e14c Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Fri, 1 Dec 2017 15:48:13 +0100 Subject: [PATCH] Updated main vuejs entry point to consider last commits (HEADER, MENU, fonts, etc) + added images --- public_html/image/header-icon.svg | 180 +++++++++++++++++++++ public_html/image/header/info/error.svg | 69 ++++++++ public_html/image/header/info/info.svg | 69 ++++++++ public_html/image/header/info/warning.svg | 69 ++++++++ public_html/image/header/notif/bell.svg | 46 ++++++ public_html/image/header/notif/menu.svg | 74 +++++++++ public_html/image/header/notif/message.svg | 46 ++++++ public_html/image/header/notif/search.svg | 44 +++++ public_html/image/leaf.svg | 122 ++++++++++++++ public_html/image/menu/dashboard.svg | 1 + public_html/image/menu/messages.svg | 1 + public_html/image/menu/profile.svg | 1 + view/home.php | 3 + view/main.js | 14 +- view/vue/main.vue | 55 ------- view/vue/wrapper.vue | 35 ++++ 16 files changed, 769 insertions(+), 60 deletions(-) create mode 100644 public_html/image/header-icon.svg create mode 100644 public_html/image/header/info/error.svg create mode 100644 public_html/image/header/info/info.svg create mode 100644 public_html/image/header/info/warning.svg create mode 100644 public_html/image/header/notif/bell.svg create mode 100644 public_html/image/header/notif/menu.svg create mode 100644 public_html/image/header/notif/message.svg create mode 100644 public_html/image/header/notif/search.svg create mode 100644 public_html/image/leaf.svg create mode 100644 public_html/image/menu/dashboard.svg create mode 100644 public_html/image/menu/messages.svg create mode 100644 public_html/image/menu/profile.svg delete mode 100755 view/vue/main.vue create mode 100755 view/vue/wrapper.vue diff --git a/public_html/image/header-icon.svg b/public_html/image/header-icon.svg new file mode 100644 index 0000000..2b8f38d --- /dev/null +++ b/public_html/image/header-icon.svg @@ -0,0 +1,180 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/public_html/image/header/info/error.svg b/public_html/image/header/info/error.svg new file mode 100644 index 0000000..753883a --- /dev/null +++ b/public_html/image/header/info/error.svg @@ -0,0 +1,69 @@ + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/public_html/image/header/info/info.svg b/public_html/image/header/info/info.svg new file mode 100644 index 0000000..6df5521 --- /dev/null +++ b/public_html/image/header/info/info.svg @@ -0,0 +1,69 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/public_html/image/header/info/warning.svg b/public_html/image/header/info/warning.svg new file mode 100644 index 0000000..0ea8c81 --- /dev/null +++ b/public_html/image/header/info/warning.svg @@ -0,0 +1,69 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/public_html/image/header/notif/bell.svg b/public_html/image/header/notif/bell.svg new file mode 100644 index 0000000..13d181e --- /dev/null +++ b/public_html/image/header/notif/bell.svg @@ -0,0 +1,46 @@ + +image/svg+xml \ No newline at end of file diff --git a/public_html/image/header/notif/menu.svg b/public_html/image/header/notif/menu.svg new file mode 100644 index 0000000..4701211 --- /dev/null +++ b/public_html/image/header/notif/menu.svg @@ -0,0 +1,74 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/public_html/image/header/notif/message.svg b/public_html/image/header/notif/message.svg new file mode 100644 index 0000000..1c87d15 --- /dev/null +++ b/public_html/image/header/notif/message.svg @@ -0,0 +1,46 @@ + +image/svg+xml \ No newline at end of file diff --git a/public_html/image/header/notif/search.svg b/public_html/image/header/notif/search.svg new file mode 100644 index 0000000..89c085d --- /dev/null +++ b/public_html/image/header/notif/search.svg @@ -0,0 +1,44 @@ + +image/svg+xml \ No newline at end of file diff --git a/public_html/image/leaf.svg b/public_html/image/leaf.svg new file mode 100644 index 0000000..20d068d --- /dev/null +++ b/public_html/image/leaf.svg @@ -0,0 +1,122 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public_html/image/menu/dashboard.svg b/public_html/image/menu/dashboard.svg new file mode 100644 index 0000000..ecbb277 --- /dev/null +++ b/public_html/image/menu/dashboard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public_html/image/menu/messages.svg b/public_html/image/menu/messages.svg new file mode 100644 index 0000000..e576ad6 --- /dev/null +++ b/public_html/image/menu/messages.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public_html/image/menu/profile.svg b/public_html/image/menu/profile.svg new file mode 100644 index 0000000..90bf628 --- /dev/null +++ b/public_html/image/menu/profile.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/view/home.php b/view/home.php index e5f7457..10cbfd8 100755 --- a/view/home.php +++ b/view/home.php @@ -13,7 +13,10 @@ + + + diff --git a/view/main.js b/view/main.js index a809545..4547727 100755 --- a/view/main.js +++ b/view/main.js @@ -8,7 +8,7 @@ import {API} from './lib/api-es6' import {WSClient,WSClientBuilder} from './lib/ws-client-es6' /* (3) Vues */ -import main_vue from './vue/main.vue' +import wrapper_vue from './vue/wrapper.vue' /* (2) Initialisation @@ -19,11 +19,15 @@ window.api = new API("http://ndli1718/api/v/1.0/"); /* (2) wsclient */ window.wsc = new WSClientBuilder("wss://websocket.xdrm.io"); -/* (3) Render view */ +/* (3) global store init */ +require('./vue-config'); +window.gstore.add('server', window._SERVER); + +/* (4) Render view */ new Vue({ el: '#main-vue', - render: h => h(main_vue), - data: { - 'server': window._SERVER + render: h => h(wrapper_vue), + data: { + gstore: window.gstore.data } }) diff --git a/view/vue/main.vue b/view/vue/main.vue deleted file mode 100755 index a2cec9b..0000000 --- a/view/vue/main.vue +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - diff --git a/view/vue/wrapper.vue b/view/vue/wrapper.vue new file mode 100755 index 0000000..d5e094a --- /dev/null +++ b/view/vue/wrapper.vue @@ -0,0 +1,35 @@ + + + + + + + \ No newline at end of file