From ff129222b93daf64d5e5221bb140d40486ab2d50 Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Wed, 6 Dec 2017 21:38:04 +0100 Subject: [PATCH 1/2] upd: ... (added component 'notification-stack' to wrapper, can be shown with 'gstore.data.nstack=true' + its css) --- public_html/css/layout.css | 25 +++++++++++ public_html/css/notification-stack.css | 58 ++++++++++++++++++++++++++ view/home.php | 1 + view/vue-config.js | 5 ++- view/vue/notification-stack.vue | 24 +++++++++++ view/vue/wrapper.vue | 14 ++++++- 6 files changed, 124 insertions(+), 3 deletions(-) create mode 100644 public_html/css/notification-stack.css create mode 100644 view/vue/notification-stack.vue diff --git a/public_html/css/layout.css b/public_html/css/layout.css index 8e21df4..9435521 100644 --- a/public_html/css/layout.css +++ b/public_html/css/layout.css @@ -91,4 +91,29 @@ body{ #WRAPPER.min #CONTAINER{ left: 3.5em; width: calc( 100% - 3.5em ); +} + + +/* Notification Stack */ +#WRAPPER #NOTIF-STACK{ + display: none; + position: absolute; + top: 4em; + left: calc( 100% - 15em ); + width: 14em; + min-height: 2em; + height: auto; + + border: 1px solid #ddd; + border-radius: 3px; + + background-color: #fff; + + overflow: hidden; + + z-index: 101; +} + +#WRAPPER #NOTIF-STACK.active{ + display: block; } \ No newline at end of file diff --git a/public_html/css/notification-stack.css b/public_html/css/notification-stack.css new file mode 100644 index 0000000..a9be6d7 --- /dev/null +++ b/public_html/css/notification-stack.css @@ -0,0 +1,58 @@ +/* Header */ +#NOTIF-STACK > .head{ + display: block; + position: relative; + width: 100%; + + padding: .7em 0; + + border-radius: 3px 3px 0 0; + border-bottom: 1px solid #ddd; + + text-align: center; + color: #888; +} + +/* Container */ +#NOTIF-STACK > .body{ + display: block; + position: relative; + width: 100%; + min-height: 2em; + height: auto; + max-height: 12em; + + border-radius: 0 0 3px 3px; + + overflow: auto; + +} + +/* Items */ +#NOTIF-STACK > .body > span{ + display: block; + position: relative; + + padding: .8em 1em; + + border-bottom: 1px solid #ddd; + + background-color: #fff; + + color: #555; + + cursor: pointer; + + transition: background-color .2s ease-in-out, + color .2s ease-in-out; +} + +#NOTIF-STACK > .body > span:hover{ + background-color: #eee; + color: #333; +} + +#NOTIF-STACK > .body > span:last-child{ + border: 0; + border-radius: 0 0 3px 3px; +} \ No newline at end of file diff --git a/view/home.php b/view/home.php index 0565d56..a50101e 100755 --- a/view/home.php +++ b/view/home.php @@ -18,6 +18,7 @@ + diff --git a/view/vue-config.js b/view/vue-config.js index 2ea0a30..c64aff0 100644 --- a/view/vue-config.js +++ b/view/vue-config.js @@ -89,4 +89,7 @@ gstore.add('func', { // new-message container -gstore.add('new_msg', ''); \ No newline at end of file +gstore.add('new_msg', ''); + +// notification stack visibility +gstore.add('nstack', false); \ No newline at end of file diff --git a/view/vue/notification-stack.vue b/view/vue/notification-stack.vue new file mode 100644 index 0000000..ae0f4e1 --- /dev/null +++ b/view/vue/notification-stack.vue @@ -0,0 +1,24 @@ + + + + \ No newline at end of file diff --git a/view/vue/wrapper.vue b/view/vue/wrapper.vue index 9e01d8c..d0c649b 100755 --- a/view/vue/wrapper.vue +++ b/view/vue/wrapper.vue @@ -10,6 +10,13 @@ + + + + + + + @@ -18,13 +25,16 @@ import header_vue from './header.vue' import menu_vue from './menu.vue' + import notifstack_vue from './notification-stack.vue' + // import loginform_vue from './login-form.vue' export default { name: 'wrapper', data(){ return { gstore: gstore.data }; }, components: { - 'HeaderComp': header_vue, - 'MenuComp': menu_vue + 'HeaderComp': header_vue, + 'MenuComp': menu_vue, + 'NotifstackComp': notifstack_vue } } From 4cfb4a7f4dfa7eff8c1aefe7a87c13ca8090a14c Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Thu, 7 Dec 2017 15:27:15 +0100 Subject: [PATCH 2/2] upd: packages.json (added commands: 'ws-start', 'ws-stop', 'ws-restart') | add: ndli1718.jar (added to .gitignore) --- .gitignore | 2 ++ package.json | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index dd9a003..c51b143 100755 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +websocket.out +ndli1718.jar .vscode .DS_Store node_modules/ diff --git a/package.json b/package.json index dab4121..7ba1cf2 100755 --- a/package.json +++ b/package.json @@ -10,7 +10,11 @@ "build:bundle": "cross-env NODE_ENV=production webpack --progress --hide-modules", "build:dev": "cross-env NODE_ENV=development webpack --progress --hide-modules", "dev": "npm run build:clean; npm run build:dev", - "build": "npm run build:clean; npm run build:bundle" + "build": "npm run build:clean; npm run build:bundle", + + "ws-start": "java -jar ./ndli1718.jar > ./websocket.out 2>&1 &", + "ws-stop": "ps -aux | grep 'java -jar ./ndli1718.jar' | grep -v 'grep' && echo 'killing process..' && kill `ps -aux | grep \"java -jar ./ndli1718.jar\" | grep -v \"grep\" | awk '{print $2}'` && echo 'killed' || return 0", + "ws-restart": "npm run ws-stop; npm run ws-start" }, "dependencies": { "vue": "^2.5.9"