verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix

This commit is contained in:
Juan Ferrer Toribio 2016-11-22 13:05:22 +01:00
parent bf9928998d 26d4176fab
commit e62fc745d4
11 changed files with 104 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
@salix/core/.gitignore → @salix/core/src/.gitignore vendored
View File

8
@salix/crud/src/crud.js
View File

@ -10,10 +10,16 @@ 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 CUSTOMER_WEB_CLIENT_INDEX,
COMPONENT as CUSTOMER_WEB_CLIENT_INDEX_COMPONENT} from './customer/webclient';
export {NAME as NAVIGATION_INDEX,
COMPONENT as NAVIGATION_INDEX_COMPONENT} from './navigation/index';

36
@salix/crud/src/customer/dataBasic/index.html Normal file
View File

@ -0,0 +1,36 @@
<vn-vertical full-height pad-medium>
<vn-horizontal>
<vn-one>
<h3>CLIENTE_datos básicos</h3>
</vn-one>
</vn-horizontal>
<vn-horizontal>
<vn-two>
<vn-textfield label="ALIAS" name"alias" model="customer.fechaalta" ></vn-textfield>
<vn-textfield label="NIF/CIF" name="nif" model="customer.nif" pad-medium ></vn-textfield>
</vn-two>
</vn-horizontal>
<vn-horizontal>
<vn-two>
<vn-textfield label="RAZÓN SOCIAL" name"razonsocial" model="customer.alias"></vn-textfield>
<span pad-medim>vn-datepicked FechaAlta</span>
</vn-two>
</vn-horizontal>
<vn-horizontal>
<vn-three>
<vn-textfield label="CONTACTO" name="contacto" model="customer.contact"></vn-textfield>
<vn-textfield label="TELÉFONO" name="telefono" model="customer.phone" pad-medium></vn-textfield>
<span pad-medium>vn-combo COMERCIAL</span>
</vn-tree>
</vn-horizontal>
<vn-horizontal>
<vn-one>
<vn-textfield label="CALIDAD" name="calidad" model="customer.calidad"></vn-textfield>
</vn-one>
</vn-horizontal>
<vn-horizontal>
<vn-one>
<vn-button class="colored" text="GUARDAR"></vn-button>
</vn-one>
</vn-horizontal>
</vn-vertical>

8
@salix/crud/src/customer/dataBasic/index.js Normal file
View File

@ -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);

21
@salix/crud/src/customer/routes.js
View File

@ -15,8 +15,8 @@
image: '',
},
{
url: '/customer/edit/adress',
state: 'customer-adress',
url: '/customer/edit/address',
state: 'customer-address',
view:{
'details':{
template: '<customer-edit vn-one></customer-edit>',
@ -25,5 +25,22 @@
module: 'crud',
description: '',
image: '',
},
{
url: '/customer/dataBasic',
state: 'customer-data-basic',
template: '<customer-data-basic vn-one></customer-data-basic>',
module: 'crud',
description: '',
image: ''
},
{
url: '/customer/webclient',
state: 'customer-web-client',
template: '<customer-web-client vn-one></customer-web-client>',
module: 'crud',
description: '',
image: ''
}
]

14
@salix/crud/src/customer/webclient/index.html Normal file
View File

@ -0,0 +1,14 @@
<vn-vertical full-height pad-medium>
<vn-one>
<h2>CLIENTE_acceso web</h2>
</vn-one>
<vn-two>
<vn-check label="Acceso web activo" name="accesoweb" model="customer.activo"></vn-check>
</vn-two>
<vn-three>
<vn-textfield label="USUARIO" model="customer.user"></vn-textfield>
</vn-three>
<vn-four>
<vn-button text="Generar Contraseña" class="colored"></vn-button>
</vn-four>
</vn-vertical>

8
@salix/crud/src/customer/webclient/index.js Normal file
View File

@ -0,0 +1,8 @@
import template from './index.html';
import {module} from '../../module';
export const NAME = 'customerWebClient';
export const COMPONENT = {
template: template
};
module.component(NAME, COMPONENT);

4
docker-compose.yml
View File

@ -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:

15
env.cmd
View File

@ -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

3
services/account/server/datasources.json
View File

@ -1,7 +1,6 @@
{
"db": {
"name": "db",
"connector": "memory",
"file": "db.json"
"connector": "memory"
}
}

3
services/client/server/datasources.json
View File

@ -1,7 +1,6 @@
{
"db": {
"name": "db",
"connector": "memory",
"file": "db.json"
"connector": "memory"
}
}