From b1cf21eac95dd888ed3809cc7adc87522c01d7b1 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 1 Dec 2016 12:45:36 +0100 Subject: [PATCH 1/2] Logout --- .../src/components/main-menu/main-menu.html | 5 ++-- .../app/src/components/main-menu/main-menu.js | 14 +++++++++-- @salix/app/src/components/main-menu/style.css | 9 +++++++ @salix/app/src/styles/misc.scss | 17 +++++++++++++ @salix/core/src/core.js | 3 +-- @salix/core/src/title/title.html | 2 ++ @salix/core/src/title/title.js | 24 ++++++------------- @salix/core/src/title/title.mdl.html | 2 -- @salix/core/src/title/title.mdl.js | 13 ---------- services/salix/client/index.ejs | 2 +- 10 files changed, 52 insertions(+), 39 deletions(-) create mode 100644 @salix/app/src/components/main-menu/style.css create mode 100644 @salix/core/src/title/title.html delete mode 100644 @salix/core/src/title/title.mdl.html delete mode 100644 @salix/core/src/title/title.mdl.js diff --git a/@salix/app/src/components/main-menu/main-menu.html b/@salix/app/src/components/main-menu/main-menu.html index f221cf9a2..b178d342c 100644 --- a/@salix/app/src/components/main-menu/main-menu.html +++ b/@salix/app/src/components/main-menu/main-menu.html @@ -1,5 +1,6 @@ -
+
+ exit_to_app apps notifications - account_circle + account_circle
\ No newline at end of file diff --git a/@salix/app/src/components/main-menu/main-menu.js b/@salix/app/src/components/main-menu/main-menu.js index a774f7071..fa0933bb7 100644 --- a/@salix/app/src/components/main-menu/main-menu.js +++ b/@salix/app/src/components/main-menu/main-menu.js @@ -1,8 +1,18 @@ +require('./style.css'); import template from './main-menu.html'; import {module} from '../../module'; -export const NAME = "vnMainmenu"; +export const NAME = "vnMainMenu"; export const COMPONENT = { - template: template + template: template, + controller: function () + { + this.onLogoutClick = function () + { + let appName = 'salix'; + document.cookie = `${appName}-session=; expires=Thu, 01 Jan 1970 00:00:01 GMT;`; + window.location = `/account?api_key=${appName}`; + } + } }; module.component(NAME, COMPONENT); diff --git a/@salix/app/src/components/main-menu/style.css b/@salix/app/src/components/main-menu/style.css new file mode 100644 index 000000000..73fc9ec51 --- /dev/null +++ b/@salix/app/src/components/main-menu/style.css @@ -0,0 +1,9 @@ +vn-main-menu i { + padding: .1em; + border-radius: .1em; + vertical-align: middle; +} +vn-main-menu i:hover { + cursor: pointer; + opacity: .85; +} \ No newline at end of file diff --git a/@salix/app/src/styles/misc.scss b/@salix/app/src/styles/misc.scss index 7a95408b4..7ea83980b 100644 --- a/@salix/app/src/styles/misc.scss +++ b/@salix/app/src/styles/misc.scss @@ -5,4 +5,21 @@ box-sizing: border-box; padding: $pad-large; max-width: 1000px; +} + +html [vn-auto], vn-auto, .vn-auto, +html [vn-none], vn-none, .vn-none, +html [vn-one], vn-one, .vn-one, +html [vn-two], vn-two, .vn-two, +html [vn-three], vn-three, .vn-three, +html [vn-four], vn-four, .vn-four, +html [vn-five], vn-five, .vn-five, +html [vn-six], vn-six, .vn-six, +html [vn-seven], vn-seven, .vn-seven, +html [vn-eight], vn-eight, .vn-eight, +html [vn-nine], vn-nine, .vn-nine, +html [vn-ten], vn-ten, .vn-ten, +html [vn-eleven], vn-eleven, .vn-eleven, +html [vn-twelve], vn-twelve, .vn-twelve,{ + padding-right: .4em; } \ No newline at end of file diff --git a/@salix/core/src/core.js b/@salix/core/src/core.js index 9ba703f7e..12ff9e412 100644 --- a/@salix/core/src/core.js +++ b/@salix/core/src/core.js @@ -41,8 +41,7 @@ export {NAME as COMBO_MDL, factory as comboMdl} from './combo/combo.mdl' export {NAME as DATE_PICKER, directive as DatePickerDirective} from './date-picker/date-picker' export {NAME as DATE_PICKER_MDL, factory as datePickerMdl} from './date-picker/date-picker.mdl' -export {NAME as TITLE, directive as TitleDirective} from './title/title' -export {NAME as TITLE_MDL, factory as titleMdl} from './title/title.mdl' +export {NAME as TITLE, COMPONENT as TITLE_COMPONENT} from './title/title' diff --git a/@salix/core/src/title/title.html b/@salix/core/src/title/title.html new file mode 100644 index 000000000..bf40c9a3b --- /dev/null +++ b/@salix/core/src/title/title.html @@ -0,0 +1,2 @@ +

+

\ No newline at end of file diff --git a/@salix/core/src/title/title.js b/@salix/core/src/title/title.js index a31d23616..7cde9b468 100644 --- a/@salix/core/src/title/title.js +++ b/@salix/core/src/title/title.js @@ -1,19 +1,9 @@ +import template from './title.html'; import {module} from '../module'; -import * as resolveFactory from '../resolveDefaultComponents'; -import * as util from '../util'; -const _NAME = 'title'; -export const NAME = util.getName(_NAME); - -directive.$inject = [resolveFactory.NAME]; -export function directive (resolve){ - return { - require:'E', - transclude: true, - template: function(_,attr){ - return resolve.getTemplate(_NAME, attr); - } - } -} - -module.directive(NAME,directive); +export const NAME = "vnTitle"; +export const COMPONENT = { + template: template, + transclude: true +}; +module.component(NAME, COMPONENT); diff --git a/@salix/core/src/title/title.mdl.html b/@salix/core/src/title/title.mdl.html deleted file mode 100644 index ae367dc10..000000000 --- a/@salix/core/src/title/title.mdl.html +++ /dev/null @@ -1,2 +0,0 @@ -

-

\ No newline at end of file diff --git a/@salix/core/src/title/title.mdl.js b/@salix/core/src/title/title.mdl.js deleted file mode 100644 index 27e25f251..000000000 --- a/@salix/core/src/title/title.mdl.js +++ /dev/null @@ -1,13 +0,0 @@ -import {module} from '../module'; -import template from './title.mdl.html'; - -export const NAME = 'vnTitleMdlFactory'; - -export function factory() { - return { - template: template, - default: {} - } -} - -module.factory(NAME, factory); \ No newline at end of file diff --git a/services/salix/client/index.ejs b/services/salix/client/index.ejs index 2194cf7df..9881a4421 100644 --- a/services/salix/client/index.ejs +++ b/services/salix/client/index.ejs @@ -7,7 +7,7 @@ - +