From 5bc375d3247e0c4a3d5ae266306e7fd924a1f4e0 Mon Sep 17 00:00:00 2001 From: Daniel Herrero Date: Tue, 19 Dec 2017 14:28:19 +0100 Subject: [PATCH] list items with images --- client/item/routes.json | 6 +++- client/item/src/list/item-product.html | 14 ++++++++ client/item/src/list/item-product.js | 8 +++++ client/item/src/list/list.js | 2 ++ client/item/src/list/style.css | 16 +++++++++ services/item/common/methods/item/filter.js | 2 +- services/item/common/models/item.json | 9 +++++ services/nginx/static/images/icon_item.png | Bin 0 -> 3006 bytes services/nginx/static/images/icon_item.svg | 37 -------------------- 9 files changed, 55 insertions(+), 39 deletions(-) create mode 100644 client/item/src/list/item-product.html create mode 100644 client/item/src/list/item-product.js create mode 100644 client/item/src/list/style.css create mode 100644 services/nginx/static/images/icon_item.png delete mode 100644 services/nginx/static/images/icon_item.svg diff --git a/client/item/routes.json b/client/item/routes.json index 803a8cce8..014dc318d 100644 --- a/client/item/routes.json +++ b/client/item/routes.json @@ -1,7 +1,7 @@ { "module": "item", "name": "Items", - "icon": "/static/images/icon_item.svg", + "icon": "/static/images/icon_item.png", "routes": [ { "url": "/item", @@ -17,6 +17,10 @@ "url": "/create", "state": "item.create", "component": "vn-item-create" + }, { + "url": "/data", + "state": "item.data", + "component": "vn-item-data" } ] } \ No newline at end of file diff --git a/client/item/src/list/item-product.html b/client/item/src/list/item-product.html new file mode 100644 index 000000000..6368f1f95 --- /dev/null +++ b/client/item/src/list/item-product.html @@ -0,0 +1,14 @@ + + + + + + +
{{$ctrl.item.name}}
+
Id: {{$ctrl.item.id}}
+
Category: {{$ctrl.item.category}}
+
Description: {{$ctrl.item.description}}
+
Size: {{$ctrl.item.size}}
+ + + diff --git a/client/item/src/list/item-product.js b/client/item/src/list/item-product.js new file mode 100644 index 000000000..4f7c7b4e7 --- /dev/null +++ b/client/item/src/list/item-product.js @@ -0,0 +1,8 @@ +import ngModule from '../module'; + +ngModule.component('vnItemProduct', { + template: require('./item-product.html'), + bindings: { + item: '<' + } +}); diff --git a/client/item/src/list/list.js b/client/item/src/list/list.js index ce4d773fa..db48692d8 100644 --- a/client/item/src/list/list.js +++ b/client/item/src/list/list.js @@ -1,4 +1,6 @@ import ngModule from '../module'; +import './item-product'; +import './style.css'; class ItemList { constructor() { diff --git a/client/item/src/list/style.css b/client/item/src/list/style.css new file mode 100644 index 000000000..f6afaff66 --- /dev/null +++ b/client/item/src/list/style.css @@ -0,0 +1,16 @@ +vn-item-product { + display: block; +} +vn-item-product a { + display: block; + text-decoration: none; + color: inherit; +} +vn-item-product a:hover { + color: white; + background-color: #424242; +} + +.vn-item-product-name { + font-family: vn-font-bold; +} diff --git a/services/item/common/methods/item/filter.js b/services/item/common/methods/item/filter.js index 59be28565..c60c2222b 100644 --- a/services/item/common/methods/item/filter.js +++ b/services/item/common/methods/item/filter.js @@ -6,7 +6,7 @@ module.exports = Self => { where: {}, skip: (params.page - 1) * params.size, limit: params.size, - order: params.order || 'name ASC'/* , + order: params.order || 'relevancy DESC'/* , include: { relation: "greugeType", scope: { diff --git a/services/item/common/models/item.json b/services/item/common/models/item.json index 8479e2217..0ccbb2e4c 100644 --- a/services/item/common/models/item.json +++ b/services/item/common/models/item.json @@ -30,6 +30,15 @@ }, "isBargain": { "type": "Boolean" + }, + "comment": { + "type": "String" + }, + "relevancy": { + "type": "Number" + }, + "image": { + "type": "String" } } } \ No newline at end of file diff --git a/services/nginx/static/images/icon_item.png b/services/nginx/static/images/icon_item.png new file mode 100644 index 0000000000000000000000000000000000000000..ff660fb23ebae0b5957a21cad994edba30698650 GIT binary patch literal 3006 zcmV;v3qkaWP)jiu-93@4;NfA*)dmY9&)-VK0)P_$cK~hxL_AbXuDY0$rTPZIspYd@ z0C*smIp?8ca#bNEUG|WdnT=lWQVK=z-4+ z$FGSn+lCf!MFJlN3z*XElF2nuUA3Yxf=R5W0M?$LgEg0Dx+*6fbYie7=R}OI552%H zK6XwnQK!egq3fA^=wiy2OX{K2-~y!{S~YZmP0pWHgf$-N_=?FDp03IaGeD`UGGzuh zgylS~&|?WExRf+CaxKUbm>%SqYl1P6?6^XYB?A$jHCICyl*7Da^GG^qF`|Vi$ckN5 z=&=WSIVPdUreL`;0KW(DQ^WBqhq|iE%di6QszQ&Y^ujQ?M!*ulp8)*AaQp}Cf}4L} zH_qg0B9Q+I;8!(2A3|(Nmoui~7W+kY)?5x<$wLETNiE}hZ0Uxq*p)$#g_+tTgb3j$ z6+&!9cWi|andkQ!2_f=|d)Npek`SJo?{3jHeQ%2p*7{{aJ$7T!V@oDiealnOXZm=<>tNI1d}EH;+A?N~LnfEYS&{7x zuY()S5>fjY6^<|#k>oH9@L?omg5PLn zRqKHD*pehbTiw$4q$i{6D(~jLrpd`*A(EjtXqe(i$JiIET?9xndEFNs^jOzP&yxOL zr>o8|LXnfPcK?{-NTC-;TanB8x`Q5TS`pgRj6p4GSBxMdO-}IS@YVTa>P#tXo2ea@+1J)`Vo5K%MlcFg0ViB~oYbpsJ5gn_{JI zDaVm~jB@u8l4;^9F9G}qz+V9T3s0Ld+!KkH@Tgdck2|h&=;KJC7e_ONWa{GQ0DcSL zm!;6c*hTGvBA2SibaAAyqTDV+GHvi@?CY(13ExX7ZLp6cm6wu+igLRQ$(*;)WB;a? z?sxF3T4HeID(jYV94Yj^hdG+3_I!yziok_daMu(^nnG&NuL1lM6GDj9oU7tUA*S}o zRG7a5_>9Trj~eYoQL6+T&d+43n!LOOP&?$z_Kwl{y*dAqVYp znOuHi43|3za@}CO%!Ck-5A1R$MXot^!9`gwg7K7GlL%#u=@#VzZ;UXvhcPVp$b)N$ z6~W2@$O*wGLH~+eWx|hz$>j>k6vQmU?@&aHaEtOX;D4Me!Y=cG!Q^s^0vsP>aydkb za4Xv|xdOlm34YdNp5vo{ul*Hvf!G3^^~sjY0p{3me&D4fCYKW&ll98^kutelAyS0@ zoF6Zf%LSGQx0EFd`aqD-zd3mG1Y0gg$V+aM!Q|>458x<2yG4gk#Xiq2*>X9VRVLun z9wwJV#6&QT@K1zXnTIpCgRVw1CCw!tqTJEUV9V7zbFx6Nw1h2tr272 zici}CB6%E$8z_)PFkI04QGWDUBkoDcW zMCWDbBIVFUEnT(7(^h=IhkYLNzEAE-&{y@LmU^s@emiT@4;Rd%Cs?Ao#qlj1_jz<3 zM3v+zHxE$tSlfO(Wox!1a zP25$+(6=~NLkpwzc^q@$+SG?yLiXF~vj1?ai2kXC779FV#ixcA&M(LS@cQjsawn}la;K8$qKv090(`LygM|CR91*TXGC2-AU(_^_sk0p*ZS8CB! ztI&1TA!x2H)BJnVI5w-%M01T5E@8JgLg*rfJ+&wAL61cUAQfgP9D?O4>mQk=Iy2~> z75!`*ST4EC#+0!jzc)Li!9Fx{sTO8M0^bz6NbzA7tBG6*eb>zJUDr6!#_)$)6LmvV z{w}-3V+w&(?Oy(z$aj!s2oBY9l~Kp~sGA>d8(KXuxegmrk6pI>`zpQ0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - -