From 55691b4cc955a2df64e1e495238a8cf2774a3b17 Mon Sep 17 00:00:00 2001 From: Daniel Herrero Date: Tue, 19 Dec 2017 12:29:35 +0100 Subject: [PATCH] nuevo micro servicio Item --- client/core/src/textfield/style.scss | 9 ++++- client/item/routes.json | 2 +- client/item/src/list/list.html | 25 +++++++++++- docker-compose.yml | 14 ++++++- services/item/Dockerfile | 15 ++++++++ services/item/common/methods/item/filter.js | 20 ++++++++++ services/item/common/models/item.js | 3 ++ services/item/common/models/item.json | 35 +++++++++++++++++ services/item/package.json | 19 ++++++++++ services/item/server/config.json | 3 ++ services/item/server/model-config.json | 31 +++++++++++++++ services/item/server/server.js | 4 ++ services/nginx/conf-dev.conf | 3 ++ services/nginx/conf-prod.conf | 3 ++ .../nginx/static/images/icon_articles.svg | 38 ------------------- services/nginx/static/images/icon_item.svg | 37 ++++++++++++++++++ 16 files changed, 218 insertions(+), 43 deletions(-) create mode 100644 services/item/Dockerfile create mode 100644 services/item/common/methods/item/filter.js create mode 100644 services/item/common/models/item.js create mode 100644 services/item/common/models/item.json create mode 100644 services/item/package.json create mode 100644 services/item/server/config.json create mode 100644 services/item/server/model-config.json create mode 100644 services/item/server/server.js delete mode 100644 services/nginx/static/images/icon_articles.svg create mode 100644 services/nginx/static/images/icon_item.svg diff --git a/client/core/src/textfield/style.scss b/client/core/src/textfield/style.scss index b8d1557772..0f9d95c8ec 100644 --- a/client/core/src/textfield/style.scss +++ b/client/core/src/textfield/style.scss @@ -7,13 +7,18 @@ vn-textfield { width: auto; top: 0px; right: -6px; - margin: 22px 0px; - background: transparent; + margin: 21px 0px; + background: white; + opacity: 1; z-index: 9999; + color: #aaa; } .material-icons { font-size: 18px; float: right; margin-right: 5px; } + .material-icons:hover { + color: rgba(0,0,0, .87); + } } \ No newline at end of file diff --git a/client/item/routes.json b/client/item/routes.json index 9f811bea78..803a8cce8f 100644 --- a/client/item/routes.json +++ b/client/item/routes.json @@ -1,7 +1,7 @@ { "module": "item", "name": "Items", - "icon": "/static/images/icon_articles.svg", + "icon": "/static/images/icon_item.svg", "routes": [ { "url": "/item", diff --git a/client/item/src/list/list.html b/client/item/src/list/list.html index 2e1f6a06ed..c1996e46f5 100644 --- a/client/item/src/list/list.html +++ b/client/item/src/list/list.html @@ -1 +1,24 @@ -

hi world

\ No newline at end of file + +
+
+ + + + + + + + + + +
+ + + +
\ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index b8d64389b3..4dcb065b7a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -87,7 +87,19 @@ services: expose: - "3006" ports: - - "3006:3006" + - "3006:3006" + item: + environment: + - NODE_ENV=${NODE_ENV} + container_name: "${BRANCH_NAME}-item" + image: "item:${TAG}" + build: + context: ./services + dockerfile: /item/Dockerfile + expose: + - "3007" + ports: + - "3007:3007" nginx: container_name: "${BRANCH_NAME}-nginx" image: "nginx:${TAG}" diff --git a/services/item/Dockerfile b/services/item/Dockerfile new file mode 100644 index 0000000000..73be207775 --- /dev/null +++ b/services/item/Dockerfile @@ -0,0 +1,15 @@ +FROM node:6.9.1 + +COPY item /app + +COPY loopback /loopback + +WORKDIR /app + +RUN npm install + +RUN npm -g install pm2 + +CMD ["pm2-docker", "./server/server.js"] + +EXPOSE 3007 diff --git a/services/item/common/methods/item/filter.js b/services/item/common/methods/item/filter.js new file mode 100644 index 0000000000..59be28565e --- /dev/null +++ b/services/item/common/methods/item/filter.js @@ -0,0 +1,20 @@ +module.exports = Self => { + Self.installMethod('filter', filterParams); + + function filterParams(params) { + let filter = { + where: {}, + skip: (params.page - 1) * params.size, + limit: params.size, + order: params.order || 'name ASC'/* , + include: { + relation: "greugeType", + scope: { + fields: ["id", "name"] + } + } */ + }; + + return filter; + } +}; diff --git a/services/item/common/models/item.js b/services/item/common/models/item.js new file mode 100644 index 0000000000..4c8019af33 --- /dev/null +++ b/services/item/common/models/item.js @@ -0,0 +1,3 @@ +module.exports = function(Self) { + require('../methods/item/filter.js')(Self); +}; diff --git a/services/item/common/models/item.json b/services/item/common/models/item.json new file mode 100644 index 0000000000..8479e22179 --- /dev/null +++ b/services/item/common/models/item.json @@ -0,0 +1,35 @@ +{ + "name": "Item", + "base": "VnModel", + "options": { + "mysql": { + "table": "item", + "database": "vn" + } + }, + "properties": { + "id": { + "type": "Number", + "id": true, + "description": "Identifier" + }, + "size": { + "type": "Number" + }, + "category": { + "type": "Number" + }, + "stems": { + "type": "Number" + }, + "description": { + "type": "String" + }, + "isOnOffer": { + "type": "Boolean" + }, + "isBargain": { + "type": "Boolean" + } + } + } \ No newline at end of file diff --git a/services/item/package.json b/services/item/package.json new file mode 100644 index 0000000000..7a9c9b48a7 --- /dev/null +++ b/services/item/package.json @@ -0,0 +1,19 @@ +{ + "name": "vn-item", + "version": "1.0.0", + "main": "server/server.js", + "scripts": { + "lint": "eslint .", + "start": "node .", + "posttest": "npm run lint && nsp check" + }, + "repository": { + "type": "git", + "url": "https://git.verdnatura.es/salix" + }, + "license": "GPL-3.0", + "description": "vn-item", + "dependencies": { + "uuid": "^3.1.0" + } +} diff --git a/services/item/server/config.json b/services/item/server/config.json new file mode 100644 index 0000000000..f52e73b1d0 --- /dev/null +++ b/services/item/server/config.json @@ -0,0 +1,3 @@ +{ + "port": 3007 +} diff --git a/services/item/server/model-config.json b/services/item/server/model-config.json new file mode 100644 index 0000000000..60b0133b33 --- /dev/null +++ b/services/item/server/model-config.json @@ -0,0 +1,31 @@ +{ + "user": { + "dataSource": "salix" + }, + "AccessToken": { + "dataSource": "salix", + "relations": { + "user": { + "type": "belongsTo", + "model": "user", + "foreignKey": "userId" + } + } + }, + "ACL": { + "dataSource": "salix" + }, + "RoleMapping": { + "dataSource": "salix" + }, + "Role": { + "dataSource": "salix" + }, + "Account": { + "dataSource": "salix" + }, + "Item": { + "dataSource": "vn" + } + +} diff --git a/services/item/server/server.js b/services/item/server/server.js new file mode 100644 index 0000000000..f0493dcd94 --- /dev/null +++ b/services/item/server/server.js @@ -0,0 +1,4 @@ +var vnLoopback = require('../../loopback/server/server.js'); + +var app = module.exports = vnLoopback.loopback(); +vnLoopback.boot(app, __dirname, module); diff --git a/services/nginx/conf-dev.conf b/services/nginx/conf-dev.conf index b35bd3757a..104bd704f1 100644 --- a/services/nginx/conf-dev.conf +++ b/services/nginx/conf-dev.conf @@ -46,6 +46,9 @@ http { location ~ ^/print(?:/(.*))?$ { proxy_pass http://127.0.0.1:3006/$1$is_args$args; } + location ~ ^/item(?:/(.*))?$ { + proxy_pass http://127.0.0.1:3007/$1$is_args$args; + } # Este tiene que ser el último location ~ ^(?:/(.*))?$ { proxy_pass http://127.0.0.1:3001/$1$is_args$args; diff --git a/services/nginx/conf-prod.conf b/services/nginx/conf-prod.conf index eab866aaa5..9e8843344c 100644 --- a/services/nginx/conf-prod.conf +++ b/services/nginx/conf-prod.conf @@ -41,6 +41,9 @@ http { location ~ ^/print(?:/(.*))?$ { proxy_pass http://print:3006/$1$is_args$args; } + location ~ ^/item(?:/(.*))?$ { + proxy_pass http://item:3007/$1$is_args$args; + } # Este tiene que ser el último location ~ ^(?:/(.*))?$ { proxy_pass http://salix:3001/$1$is_args$args; diff --git a/services/nginx/static/images/icon_articles.svg b/services/nginx/static/images/icon_articles.svg deleted file mode 100644 index cfd090f11f..0000000000 --- a/services/nginx/static/images/icon_articles.svg +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/nginx/static/images/icon_item.svg b/services/nginx/static/images/icon_item.svg new file mode 100644 index 0000000000..2cebc333f0 --- /dev/null +++ b/services/nginx/static/images/icon_item.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +