From d4fedb2cbb7f90d72abce6248c73981069c3aeb8 Mon Sep 17 00:00:00 2001 From: nelo Date: Thu, 1 Dec 2016 15:14:37 +0100 Subject: [PATCH] =?UTF-8?q?Separaci=C3=B3n=20de=20la=20search=20bar=20del?= =?UTF-8?q?=20top=20bar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- @salix/app/src/components.js | 3 +- .../src/components/main-menu/main-menu.html | 5 +++- .../src/components/searchbar/searchbar.html | 6 ++++ .../app/src/components/searchbar/searchbar.js | 11 +++++++ @salix/app/src/components/topbar/topbar.html | 10 ++----- @salix/core/src/core.js | 3 -- @salix/core/src/searchbar/searchbar.bt.html | 1 - @salix/core/src/searchbar/searchbar.bt.js | 20 ------------- @salix/core/src/searchbar/searchbar.js | 18 ----------- @salix/core/src/searchbar/searchbar.mdl.html | 11 ------- @salix/core/src/searchbar/searchbar.mdl.js | 20 ------------- @salix/crud/src/client/basic-data/index.html | 2 +- @salix/crud/src/client/client.js | 2 ++ @salix/crud/src/client/fiscal-data/index.js | 1 + @salix/crud/src/client/index/index.html | 27 ++++------------- .../src/client/panelsearch/panelsearch.html | 30 +++++++++++++++++++ .../src/client/panelsearch/panelsearch.js | 9 ++++++ services/client/server/datasources.json | 3 +- 18 files changed, 76 insertions(+), 106 deletions(-) create mode 100644 @salix/app/src/components/searchbar/searchbar.html create mode 100644 @salix/app/src/components/searchbar/searchbar.js delete mode 100644 @salix/core/src/searchbar/searchbar.bt.html delete mode 100644 @salix/core/src/searchbar/searchbar.bt.js delete mode 100644 @salix/core/src/searchbar/searchbar.js delete mode 100644 @salix/core/src/searchbar/searchbar.mdl.html delete mode 100644 @salix/core/src/searchbar/searchbar.mdl.js create mode 100644 @salix/crud/src/client/panelsearch/panelsearch.html create mode 100644 @salix/crud/src/client/panelsearch/panelsearch.js diff --git a/@salix/app/src/components.js b/@salix/app/src/components.js index 454d0573f..562f76c32 100644 --- a/@salix/app/src/components.js +++ b/@salix/app/src/components.js @@ -2,4 +2,5 @@ export {NAME as VN_MAINMENU, COMPONENT as VN_MAINMENU_COMPONENT} from './compone export {NAME as ACTIONS, COMPONENT as ACTIONS_COMPONENT} from './components/left-menu/actions'; export {NAME as LEFT_MENU, COMPONENT as LEFTMENU_COMPONENT} from './components/left-menu/left-menu'; export {NAME as MENU_ITEM, COMPONENT as MENU_ITEM_COMPONENT} from './components/left-menu/menu-item'; -export {NAME as CLIENT_TOPBAR, COMPONENT as CLIENT_TOPBAR_COMPONENT} from './components/topbar/topbar'; +export {NAME as TOPBAR, COMPONENT as TOPBAR_COMPONENT} from './components/topbar/topbar'; +export {NAME as SEARCHBAR, COMPONENT as SEARCHBAR_COMPONENT} from './components/searchbar/searchbar'; diff --git a/@salix/app/src/components/main-menu/main-menu.html b/@salix/app/src/components/main-menu/main-menu.html index f221cf9a2..a3b20197c 100644 --- a/@salix/app/src/components/main-menu/main-menu.html +++ b/@salix/app/src/components/main-menu/main-menu.html @@ -1,5 +1,8 @@
- apps + apps notifications account_circle +
\ No newline at end of file diff --git a/@salix/app/src/components/searchbar/searchbar.html b/@salix/app/src/components/searchbar/searchbar.html new file mode 100644 index 000000000..4f376c400 --- /dev/null +++ b/@salix/app/src/components/searchbar/searchbar.html @@ -0,0 +1,6 @@ + + + keyboard_arrow_down + + + \ No newline at end of file diff --git a/@salix/app/src/components/searchbar/searchbar.js b/@salix/app/src/components/searchbar/searchbar.js new file mode 100644 index 000000000..0d9e5efc2 --- /dev/null +++ b/@salix/app/src/components/searchbar/searchbar.js @@ -0,0 +1,11 @@ +import template from './searchbar.html'; +import {module} from '../../module'; + +export const NAME = 'vnSearchbar' +export const COMPONENT = { + template: template, + controller: function(){ + + } +}; +module.component(NAME, COMPONENT); diff --git a/@salix/app/src/components/topbar/topbar.html b/@salix/app/src/components/topbar/topbar.html index e9238e0f2..fd4ce57ec 100644 --- a/@salix/app/src/components/topbar/topbar.html +++ b/@salix/app/src/components/topbar/topbar.html @@ -1,8 +1,2 @@ - - -

Client

- - - - - \ No newline at end of file +
+
\ No newline at end of file diff --git a/@salix/core/src/core.js b/@salix/core/src/core.js index 9ba703f7e..8c1cfa7ef 100644 --- a/@salix/core/src/core.js +++ b/@salix/core/src/core.js @@ -23,9 +23,6 @@ export {NAME as TEXTFIELD_BT, factory as textfieldBt} from './textfield/textfiel export {NAME as LABEL, directive as LabelDirective} from './label/label' export {NAME as LABEL_MDL, factory as labelMdl} from './label/label.mdl' export {NAME as LABEL_BT, factory as labelBt} from './label/label.bt' -export {NAME as SEARCHBAR, directive as searchbar} from './searchbar/searchbar' -export {NAME as SEARCHBAR_MDL, factory as searchbarMdl} from './searchbar/searchbar.mdl' -export {NAME as SEARCHBAR_BT, factory as searchbarBt} from './searchbar/searchbar.bt' export {NAME as ICON_BUTTON, directive as IconButtonDirective} from './icon-button/icon-button' export {NAME as ICON_BUTTON_MDL, factory as iconButtonMdl} from './icon-button/icon-button.mdl' export {NAME as PASSWORD, directive as PasswordDirective} from './password/password' diff --git a/@salix/core/src/searchbar/searchbar.bt.html b/@salix/core/src/searchbar/searchbar.bt.html deleted file mode 100644 index 6f11ff1d2..000000000 --- a/@salix/core/src/searchbar/searchbar.bt.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/@salix/core/src/searchbar/searchbar.bt.js b/@salix/core/src/searchbar/searchbar.bt.js deleted file mode 100644 index 6c466b3f2..000000000 --- a/@salix/core/src/searchbar/searchbar.bt.js +++ /dev/null @@ -1,20 +0,0 @@ -import {module as _module} from '../module'; -import * as util from '../util'; -import * as constant from '../constants'; -import template from './searchbar.bt.html'; - -const _NAME = 'searchbar'; -const DEFAULT_TEXT = 'Search'; - -export const NAME = util.getFactoryName(_NAME + constant.BOOTSTRAP_FRAMEWORK); - -export function factory() { - return { - template: template, - default: { - text: DEFAULT_TEXT - } - }; -} - -_module.factory(NAME, factory); diff --git a/@salix/core/src/searchbar/searchbar.js b/@salix/core/src/searchbar/searchbar.js deleted file mode 100644 index 04c351fd8..000000000 --- a/@salix/core/src/searchbar/searchbar.js +++ /dev/null @@ -1,18 +0,0 @@ -import {module as _module} from '../module'; -import * as resolveFactory from '../resolveDefaultComponents'; -import * as util from '../util'; - -const _NAME = 'searchbar'; -export const NAME = util.getName(_NAME); - -directive.$inject = [resolveFactory.NAME]; -export function directive(resolve) { - return { - require: 'E', - template: function(_, attr) { - return resolve.getTemplate(_NAME, attr); - } - }; -} - -_module.directive(NAME, directive); diff --git a/@salix/core/src/searchbar/searchbar.mdl.html b/@salix/core/src/searchbar/searchbar.mdl.html deleted file mode 100644 index bf432de77..000000000 --- a/@salix/core/src/searchbar/searchbar.mdl.html +++ /dev/null @@ -1,11 +0,0 @@ -
-
- -
- - -
-
-
\ No newline at end of file diff --git a/@salix/core/src/searchbar/searchbar.mdl.js b/@salix/core/src/searchbar/searchbar.mdl.js deleted file mode 100644 index 8648745dc..000000000 --- a/@salix/core/src/searchbar/searchbar.mdl.js +++ /dev/null @@ -1,20 +0,0 @@ -import {module as _module} from '../module'; -import * as util from '../util'; -import * as constant from '../constants'; -import template from './searchbar.mdl.html'; - -const _NAME = 'searchbar'; -const DEFAULT_TEXT = 'Search'; - -export const NAME = util.getFactoryName(_NAME + constant.MATERIAL_DESIGN_FRAMEWORK); - -export function factory() { - return { - template: template, - default: { - text: DEFAULT_TEXT - } - }; -} - -_module.factory(NAME, factory); diff --git a/@salix/crud/src/client/basic-data/index.html b/@salix/crud/src/client/basic-data/index.html index b38d19fd9..92326c6cf 100644 --- a/@salix/crud/src/client/basic-data/index.html +++ b/@salix/crud/src/client/basic-data/index.html @@ -21,7 +21,7 @@ - + \ No newline at end of file diff --git a/@salix/crud/src/client/client.js b/@salix/crud/src/client/client.js index 18b1f3f64..96bd29c33 100644 --- a/@salix/crud/src/client/client.js +++ b/@salix/crud/src/client/client.js @@ -12,3 +12,5 @@ export {NAME as CLIENT_WEB_ACCESS, COMPONENT as CLIENT_WEB_ACCESS_COMPONENT} from './web-access/index'; export {NAME as CLIENT_DESCRIPTOR, COMPONENT as CLIENT_DESCRIPTOR_COMPONENT} from './descriptor/descriptor'; +export {NAME as CLIENT_PANELSEARCH, + COMPONENT as CLIENT_PANELSEARCH_COMPONENT} from './panelsearch/panelsearch'; diff --git a/@salix/crud/src/client/fiscal-data/index.js b/@salix/crud/src/client/fiscal-data/index.js index d46d8d7cc..09840c98c 100644 --- a/@salix/crud/src/client/fiscal-data/index.js +++ b/@salix/crud/src/client/fiscal-data/index.js @@ -14,3 +14,4 @@ export const COMPONENT = { } }; module.component(NAME, COMPONENT); + diff --git a/@salix/crud/src/client/index/index.html b/@salix/crud/src/client/index/index.html index 8e33b1ef4..6e7dddb3f 100644 --- a/@salix/crud/src/client/index/index.html +++ b/@salix/crud/src/client/index/index.html @@ -1,26 +1,11 @@
- - - - - - - - - - - - - - - - - - - - - + + + + + +
\ No newline at end of file diff --git a/@salix/crud/src/client/panelsearch/panelsearch.html b/@salix/crud/src/client/panelsearch/panelsearch.html new file mode 100644 index 000000000..865fc768b --- /dev/null +++ b/@salix/crud/src/client/panelsearch/panelsearch.html @@ -0,0 +1,30 @@ +
+
+ + + + + + + + + + + + + + + + + + + + + + add_shopping_cartAdd to shopping cart + + + +
+
+ diff --git a/@salix/crud/src/client/panelsearch/panelsearch.js b/@salix/crud/src/client/panelsearch/panelsearch.js new file mode 100644 index 000000000..a53053d00 --- /dev/null +++ b/@salix/crud/src/client/panelsearch/panelsearch.js @@ -0,0 +1,9 @@ +import template from './panelsearch.html'; +import {module} from '../../module'; + +const _NAME = 'panelsearch'; +export const NAME = "vnPanelsearch"; +export const COMPONENT = { + template: template +}; +module.component(NAME, COMPONENT); diff --git a/services/client/server/datasources.json b/services/client/server/datasources.json index d6caf56d4..8adff1558 100644 --- a/services/client/server/datasources.json +++ b/services/client/server/datasources.json @@ -1,6 +1,7 @@ { "db": { "name": "db", - "connector": "memory" + "connector": "memory", + "file": "db.json" } }