diff --git a/@salix/app/src/components.js b/@salix/app/src/components.js index 562f76c32..f726f89da 100644 --- a/@salix/app/src/components.js +++ b/@salix/app/src/components.js @@ -1,3 +1,4 @@ +export {NAME as APP, COMPONENT as APP_COMPONENT} from './components/app/app'; export {NAME as VN_MAINMENU, COMPONENT as VN_MAINMENU_COMPONENT} from './components/main-menu/main-menu'; export {NAME as ACTIONS, COMPONENT as ACTIONS_COMPONENT} from './components/left-menu/actions'; export {NAME as LEFT_MENU, COMPONENT as LEFTMENU_COMPONENT} from './components/left-menu/left-menu'; diff --git a/@salix/app/src/components/app/app.html b/@salix/app/src/components/app/app.html new file mode 100644 index 000000000..374f98e14 --- /dev/null +++ b/@salix/app/src/components/app/app.html @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/@salix/app/src/components/app/app.js b/@salix/app/src/components/app/app.js new file mode 100644 index 000000000..0967d792b --- /dev/null +++ b/@salix/app/src/components/app/app.js @@ -0,0 +1,9 @@ +require('./style.css'); +import template from './app.html'; +import {module} from '../../module'; + +export const NAME = 'vnApp'; +export const COMPONENT = { + template: template +}; +module.component(NAME, COMPONENT); diff --git a/@salix/app/src/components/app/style.css b/@salix/app/src/components/app/style.css new file mode 100644 index 000000000..ab39408df --- /dev/null +++ b/@salix/app/src/components/app/style.css @@ -0,0 +1,7 @@ +vn-app { + height: 100%; +} + +vn-app .main-view > * { + height: 100%; +} \ No newline at end of file diff --git a/@salix/app/src/configroutes.js b/@salix/app/src/configroutes.js index 0d351c427..8045a2b5c 100644 --- a/@salix/app/src/configroutes.js +++ b/@salix/app/src/configroutes.js @@ -42,7 +42,7 @@ function config($stateProvider, $urlRouterProvider) { fileRoutes.forEach(function(route) { $stateProvider.state(route.state, { url: route.url, - template: `<${route.component} full-height ${getParams(route)}>`, + template: `<${route.component} ${getParams(route)}>`, resolve: { loader: loader(module) } diff --git a/services/salix/client/index.ejs b/services/salix/client/index.ejs index b26d25ee9..34a74f738 100644 --- a/services/salix/client/index.ejs +++ b/services/salix/client/index.ejs @@ -6,10 +6,7 @@ - - - - +