Merge
This commit is contained in:
commit
e1b71136f5
|
@ -0,0 +1,13 @@
|
|||
# EditorConfig helps developers define and maintain consistent
|
||||
# coding styles between different editors and IDEs
|
||||
# http://editorconfig.org
|
||||
|
||||
root = true
|
||||
|
||||
[*]
|
||||
indent_style = space
|
||||
indent_size = 2
|
||||
end_of_line = lf
|
||||
charset = utf-8
|
||||
trim_trailing_whitespace = true
|
||||
insert_final_newline = true
|
|
@ -0,0 +1,9 @@
|
|||
FROM node:6.9.1
|
||||
|
||||
COPY . /app
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
RUN npm install
|
||||
|
||||
CMD ["npm", "start"]
|
|
@ -0,0 +1,9 @@
|
|||
FROM node:6.9.1
|
||||
|
||||
COPY . /app
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
RUN npm install
|
||||
|
||||
CMD ["npm", "start"]
|
|
@ -0,0 +1,9 @@
|
|||
FROM node:6.9.1
|
||||
|
||||
COPY . /app
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
RUN npm install
|
||||
|
||||
CMD ["npm", "start"]
|
|
@ -6,18 +6,9 @@
|
|||
<link rel="stylesheet" href="layout.css"/>
|
||||
</head>
|
||||
<body>
|
||||
<vn-vertical id="app" class="full-height">
|
||||
<vn-horizontal>
|
||||
<vn-one>
|
||||
Barra de Aplicación
|
||||
</vn-one>
|
||||
</vn-horizontal>
|
||||
<vn-horizontal ui-view scrollable>
|
||||
<vn-one>
|
||||
Loading......
|
||||
</vn-one>
|
||||
<div style="position:fixed; top:0; right:0; height:6em; width:10em; background-color:red;"></div>
|
||||
|
||||
</vn-horizontal>
|
||||
<vn-vertical id="app" class="full-height" ui-view scrollable>
|
||||
</vn-vertical>
|
||||
<script
|
||||
type="text/javascript"
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
"installedESLint": true,
|
||||
"rules": {
|
||||
"indent": ["error", 4],
|
||||
"require-jsdoc": 0
|
||||
"require-jsdoc": 0,
|
||||
"max-len": 0
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,9 @@
|
|||
FROM nginx
|
||||
|
||||
RUN rm /etc/nginx/nginx.conf
|
||||
|
||||
RUN rm /etc/nginx/conf.d/default.conf
|
||||
|
||||
COPY nginx_docker.conf /etc/nginx/nginx.conf
|
||||
|
||||
COPY build /etc/nginx
|
|
@ -0,0 +1 @@
|
|||
<!-- por definir -->
|
|
@ -0,0 +1,8 @@
|
|||
import template from './{name}.html';
|
||||
import {module} from '../../module';
|
||||
|
||||
export const NAME = '';
|
||||
export const COMPONENT = {
|
||||
template: template
|
||||
};
|
||||
module.component(NAME, COMPONENT);
|
|
@ -5,14 +5,14 @@ import * as util from '../util';
|
|||
const _NAME = 'button';
|
||||
export const NAME = util.getName(_NAME);
|
||||
|
||||
directive.$inject =[resolveFactory.NAME];
|
||||
export function directive (resolve){
|
||||
return{
|
||||
require:'E',
|
||||
template: function(_,attr){
|
||||
directive.$inject = [resolveFactory.NAME];
|
||||
export function directive(resolve) {
|
||||
return {
|
||||
require: 'E',
|
||||
template: function(_, attr) {
|
||||
return resolve.getTemplate(_NAME, attr);
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
_module.directive(NAME,directive);
|
||||
_module.directive(NAME, directive);
|
||||
|
|
|
@ -25,6 +25,8 @@ export {NAME as TEXTFIELDBT,factory as textfieldbt} from './textfield/textfield.
|
|||
export {NAME as LABEL,directive as LabelDirective} from './label/label'
|
||||
export {NAME as LABELMT,factory as labelmt} from './label/label.mt'
|
||||
export {NAME as LABELBT,factory as labelbt} from './label/label.bt'
|
||||
export {NAME as SEARCHBARMT,factory as searchbarmt} from './searchbar/searchbar.mt'
|
||||
export {NAME as SEARCHBARBT,factory as searchbarbt} from './searchbar/searchbar.bt'
|
||||
|
||||
export {NAME as PASSWORD,directive as PasswordDirective} from './password/password'
|
||||
export {NAME as PASSWORDMT,factory as passwordmt} from './password/password.mt'
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
<!-- por definir -->
|
|
@ -0,0 +1,20 @@
|
|||
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);
|
|
@ -0,0 +1,18 @@
|
|||
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);
|
|
@ -0,0 +1,11 @@
|
|||
<form action="#">
|
||||
<div class="mdl-textfield mdl-js-textfield mdl-textfield--expandable">
|
||||
<label class="mdl-button mdl-js-button mdl-button--icon" for="sample6">
|
||||
<i class="material-icons">search</i>
|
||||
</label>
|
||||
<div class="mdl-textfield__expandable-holder">
|
||||
<input class="mdl-textfield__input" type="text" id="sample6">
|
||||
<label class="mdl-textfield__label" for="sample-expandable">*[text]*</label>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
|
@ -0,0 +1,20 @@
|
|||
import {module as _module} from '../module';
|
||||
import * as util from '../util';
|
||||
import * as constant from '../constants';
|
||||
import template from './searchbar.mt.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);
|
|
@ -0,0 +1,55 @@
|
|||
|
||||
worker_processes 1;
|
||||
|
||||
error_log /var/log/nginx/error.log;
|
||||
pid /var/run/nginx.pid;
|
||||
|
||||
events {
|
||||
worker_connections 1024;
|
||||
}
|
||||
|
||||
http {
|
||||
sendfile on;
|
||||
gzip on;
|
||||
default_type application/octet-stream;
|
||||
|
||||
access_log /var/log/nginx/access.log;
|
||||
|
||||
server {
|
||||
listen 8080;
|
||||
server_name localhost;
|
||||
autoindex off;
|
||||
|
||||
root /usr/share/nginx/html;
|
||||
|
||||
location /static {
|
||||
alias public;
|
||||
autoindex on;
|
||||
}
|
||||
|
||||
location ~ ^/account(?:/(.*))?$ {
|
||||
proxy_pass http://192.168.99.100:3000/$1$is_args$args;
|
||||
}
|
||||
|
||||
location ~ ^/salix(?:/(.*))?$ {
|
||||
proxy_pass http://192.168.99.100:3001/$1$is_args$args;
|
||||
}
|
||||
|
||||
location ~ ^/customer(?:/(.*))?$ {
|
||||
proxy_pass http://192.168.99.100:3002/$1$is_args$args;
|
||||
}
|
||||
}
|
||||
|
||||
types {
|
||||
text/html html;
|
||||
application/json json;
|
||||
application/javascript js;
|
||||
text/css css scss;
|
||||
text/xml xml;
|
||||
image/x-icon ico;
|
||||
image/png png;
|
||||
image/svg+xml svg;
|
||||
image/gif gif;
|
||||
image/jpeg jpeg jpg;
|
||||
}
|
||||
}
|
|
@ -0,0 +1,22 @@
|
|||
version: '2'
|
||||
services:
|
||||
account:
|
||||
build:
|
||||
context: ./@salix-services/account
|
||||
ports:
|
||||
- "3000:3000"
|
||||
customer:
|
||||
build:
|
||||
context: ./@salix-services/customer
|
||||
ports:
|
||||
- "3002:3002"
|
||||
nginx:
|
||||
build:
|
||||
context: ./@salix
|
||||
ports:
|
||||
- "8080:8080"
|
||||
salix:
|
||||
build:
|
||||
context: ./@salix-services/salix
|
||||
ports:
|
||||
- "3001:3001"
|
Loading…
Reference in New Issue