From bfd2932112c27592d793f6e21201d34ea1c541d3 Mon Sep 17 00:00:00 2001 From: "SAMBA\\vfalco" Date: Mon, 21 Nov 2016 08:35:05 +0100 Subject: [PATCH] env.cmd y req 012 --- @salix/crud/src/crud.js | 5 ++++- @salix/crud/src/customer/dataBasic/index.html | 17 +++++++++++++++++ @salix/crud/src/customer/dataBasic/index.js | 8 ++++++++ @salix/crud/src/customer/routes.js | 12 ++++++++++-- db.json | 12 ++++++++++++ docker-compose.yml | 4 ++-- env.cmd | 15 ++++++++------- 7 files changed, 61 insertions(+), 12 deletions(-) create mode 100644 @salix/crud/src/customer/dataBasic/index.html create mode 100644 @salix/crud/src/customer/dataBasic/index.js create mode 100644 db.json diff --git a/@salix/crud/src/crud.js b/@salix/crud/src/crud.js index a075fe829..c8d4fb17d 100644 --- a/@salix/crud/src/crud.js +++ b/@salix/crud/src/crud.js @@ -10,10 +10,13 @@ export {NAME as CUSTOMER_EDIT, COMPONENT as CUSTOMER_EDIT_COMPONENT} from './customer/edit/edit'; export {NAME as CUSTOMER_DESCRIPTOR, COMPONENT as CUSTOMER_DESCRIPTOR_COMPONENT} from './customer/edit/descriptor'; - export {NAME as CUSTOMER_ACTIONS, COMPONENT as CUSTOMER_ACTIONS_COMPONENT} from './customer/edit/actions'; +export {NAME as CUSTOMER_DATA_BASIC_INDEX, + COMPONENT as CUSTOMER_DATA_BASIC_INDEX_COMPONENT} from './customer/dataBasic'; + + export {NAME as NAVIGATION_INDEX, COMPONENT as NAVIGATION_INDEX_COMPONENT} from './navigation/index'; diff --git a/@salix/crud/src/customer/dataBasic/index.html b/@salix/crud/src/customer/dataBasic/index.html new file mode 100644 index 000000000..1ba1ad41b --- /dev/null +++ b/@salix/crud/src/customer/dataBasic/index.html @@ -0,0 +1,17 @@ + + + +

CLIENTE_ficha resumida

+
+ + + ALIAS + + + + + ID CLIENTE + COMERCIAL + + +
\ No newline at end of file diff --git a/@salix/crud/src/customer/dataBasic/index.js b/@salix/crud/src/customer/dataBasic/index.js new file mode 100644 index 000000000..65925db6f --- /dev/null +++ b/@salix/crud/src/customer/dataBasic/index.js @@ -0,0 +1,8 @@ +import template from './index.html'; +import {module} from '../../module'; + +export const NAME = 'customerDataBasic'; +export const COMPONENT = { + template: template +}; +module.component(NAME, COMPONENT); diff --git a/@salix/crud/src/customer/routes.js b/@salix/crud/src/customer/routes.js index c16cdba68..572b37775 100644 --- a/@salix/crud/src/customer/routes.js +++ b/@salix/crud/src/customer/routes.js @@ -15,8 +15,8 @@ image: '', }, { - url: '/customer/edit/adress', - state: 'customer-adress', + url: '/customer/edit/address', + state: 'customer-address', view:{ 'details':{ template: '', @@ -25,5 +25,13 @@ module: 'crud', description: '', image: '', +}, +{ + url: '/customer/dataBasic', + state: 'customer-data-basic', + template: '', + module: 'crud', + description: '', + image: '' } ] diff --git a/db.json b/db.json new file mode 100644 index 000000000..5c2ab0ac8 --- /dev/null +++ b/db.json @@ -0,0 +1,12 @@ +{ + "ids": { + "User": 2, + "AccessToken": 1 + }, + "models": { + "User": { + "1": "{\"password\":\"$2a$10$6txTwO27TkbJitKUkZcXwOyEVtR9pd9wwQdBT54Su3x7yEHszvZgu\",\"email\":\"admin@admin.com\",\"id\":1}" + }, + "AccessToken": {} + } +} \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 0689d0f3a..4b1d3e98d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,9 +5,9 @@ services: context: ./@salix-services/account ports: - "3000:3000" - customer: + client: build: - context: ./@salix-services/customer + context: ./@salix-services/client ports: - "3002:3002" nginx: diff --git a/env.cmd b/env.cmd index 2a881b14a..c83603280 100644 --- a/env.cmd +++ b/env.cmd @@ -5,7 +5,7 @@ if "%1"=="start" goto caseStart if "%1"=="stop" goto caseStop goto caseUsage -caseStart: +:caseStart echo ###################### echo "Arrancando Servicios" echo ###################### @@ -13,12 +13,12 @@ caseStart: call "%0" stop call forever start forever.json call forever list - call nginx -c conf-dev.conf -p @salix + call nginx -c conf-dev.conf call cd @salix call gulp - exit 0 + goto salir -caseStop: +:caseStop echo ###################### echo "Parando Servicios" echo ###################### @@ -26,8 +26,9 @@ caseStop: call forever stopall call forever list call nginx -c conf-dev.conf -p @salix -s stop - exit 0 + goto salir -caseUsage: +:caseUsage echo "Usage: %0 [start|stop]" - exit 1 + +:salir \ No newline at end of file