verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 66 Releases Wiki Activity

Nginx fixes

This commit is contained in:
Juan Ferrer 2019-01-26 13:38:28 +01:00
parent 4aa3a839b7
commit f584bd6953
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
front/nginx.conf
View File

@ -7,7 +7,7 @@ server {
root /usr/share/nginx/html; root /usr/share/nginx/html;
location ~ ^(/[a-zA-Z0-9_-]+)?/api(?:/(.*))?$ { location ~ ^(/[a-zA-Z0-9_-]+)?(?:/api(/(.*))?)$ {
resolver 127.0.0.11; resolver 127.0.0.11;
proxy_pass http://api:3000/$1$is_args$args; proxy_pass http://api:3000/$1$is_args$args;
} }

3
front/salix/components/left-menu/left-menu.html
View File

@ -1,6 +1,7 @@
<ul ng-if="::$ctrl.items.length > 0" pad-medium-v> <ul ng-if="::$ctrl.items.length > 0" pad-medium-v>
<li ng-repeat="item in ::$ctrl.items" name="{{::item.description}}"> <li ng-repeat="item in ::$ctrl.items" name="{{::item.description}}">
<a ui-sref="{{::item.state}}" ng-class="{active: item.childs.length == 0 && item.active, expanded: item.active, collapsed: !item.active}" <a ui-sref="{{::item.state}}"
ng-class="{active: item.active && !item.childs, expanded: item.active, collapsed: !item.active}"
ng-click="$ctrl.setActive(item)"> ng-click="$ctrl.setActive(item)">
<vn-icon icon="{{::item.icon}}" ng-if="::item.icon"></vn-icon> <vn-icon icon="{{::item.icon}}" ng-if="::item.icon"></vn-icon>
<vn-icon icon="keyboard_arrow_down" ng-if="::item.childs.length > 0"></vn-icon> <vn-icon icon="keyboard_arrow_down" ng-if="::item.childs.length > 0"></vn-icon>