verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

merge index

This commit is contained in:
jgallego 2016-10-06 10:21:59 +02:00
parent fc2d75ddc3 9d5885777a
commit 750845b9fe
4 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
@salix/app/src/routes.js
View File

@ -9,10 +9,7 @@ core.module.config(function($stateProvider, $urlRouterProvider) {
$stateProvider $stateProvider
.state('index', { .state('index', {
url: "/index", url: "/index",
component:'customer.add', template :'<customer-add></customer-add>',
templateProvider: function(){
console.log("hello");
},
resolve: { resolve: {
loader: function($ocLazyLoad, $q){ loader: function($ocLazyLoad, $q){
return $q((resolve) => { return $q((resolve) => {

2
@salix/crud/src/customer/index/index.html
View File

@ -1 +1 @@
<div>index</div> <div>index from component</div>

8
@salix/crud/src/customer/index/index.js
View File

@ -1,7 +1,7 @@
import template from './index.html'; import template from './index.html';
import {module} from '../../module'; import {module} from '../../module';
export const NAME = 'customer.add'; export const NAME = 'customerAdd';
export const COMPONENT = { export const COMPONENT = {
template: template, template: template,
controller: function() { controller: function() {
@ -10,7 +10,5 @@ export const COMPONENT = {
}; };
module.component(NAME, COMPONENT); module.component(NAME, COMPONENT);
module.factory('hello',function(){return true});
module.controller('pepito',function(hello){
console.log(hello);
});

25
index.html
View File

@ -1,22 +1,17 @@
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
<title>Salix</title> <title>Salix</title>
</head> </head>
<body> <body>
<div id="app"> <div id="app">
{{1+1}}
<div ui-view></div> <div ui-view></div>
<a ui-sref="index">index</a> <a ui-sref="index">index</a>
<a ui-sref="add">add</a> <a ui-sref="add">add</a>
<a ui-sref="edit">edit</a> <a ui-sref="edit">edit</a>
<a ui-sref="delete">delete</a> <a ui-sref="delete">delete</a>
<vn-button text="texto del boton"></vn-button><br> </div>
<vn-check text="texto del text" ></vn-check><br> <script type="text/javascript" src="build/salix.app.js" selector="#app"></script>
<vn-radio text="texto del radio"></vn-radio><br>
<vn-textfield text="prueba" type="email"></vn-textfield><br>
<vn-label text="hola mundo"></vn-label>
</div>
<script type="text/javascript" src="build/salix.app.js" selector="#app"></script>
</body> </body>
</html> </html>