Added xosNgLib.css to workflow
diff --git a/views/ngXosViews/sampleView/env/default.js b/views/ngXosViews/sampleView/env/default.js
index 00512d7..dacf8e8 100644
--- a/views/ngXosViews/sampleView/env/default.js
+++ b/views/ngXosViews/sampleView/env/default.js
@@ -8,6 +8,6 @@
module.exports = {
host: 'http://xos.dev:9999/',
- xoscsrftoken: '9vrMWJNfhfV8DcpOsJ7s8RQNIKV94xHP',
- xossessionid: 'nn3tfg7j55hnvx67jgfvvo8cwnqvgex3'
+ xoscsrftoken: 'q7gXR35WCSa2R9njrZJiubGCUxGR40tX',
+ xossessionid: 'ghzz0lxwt8f7z5io9gj8ni9yrrrkgz17'
};
diff --git a/views/ngXosViews/sampleView/gulp/server.js b/views/ngXosViews/sampleView/gulp/server.js
index 3c6a8e3..22d5666 100644
--- a/views/ngXosViews/sampleView/gulp/server.js
+++ b/views/ngXosViews/sampleView/gulp/server.js
@@ -53,7 +53,8 @@
baseDir: options.src,
routes: {
// '/xosHelpers/src': options.helpers,
- '/xos/core/xoslib/static/js/vendor': options.helpers
+ '/xos/core/xoslib/static/js/vendor': options.helpers,
+ '/xos/core/static': options.static + '../../static/'
},
middleware: function(req, res, next){
if(
@@ -156,7 +157,10 @@
return gulp.src(options.src + 'index.html')
.pipe(
inject(
- gulp.src(options.src + 'css/*.css'),
+ gulp.src([
+ options.src + 'css/*.css',
+ options.static + '../../static/xosNgLib.css'
+ ]),
{
ignorePath: [options.src]
}
diff --git a/views/ngXosViews/sampleView/src/index.html b/views/ngXosViews/sampleView/src/index.html
index 7563ffc..66f9535 100644
--- a/views/ngXosViews/sampleView/src/index.html
+++ b/views/ngXosViews/sampleView/src/index.html
@@ -4,6 +4,7 @@
<!-- endbower --><!-- endcss -->
<!-- inject:css -->
<link rel="stylesheet" href="/css/main.css">
+<link rel="stylesheet" href="/../../../xos/core/static/xosNgLib.css">
<!-- endinject -->
<div ng-app="xos.sampleView" id="xosSampleView" class="container-fluid">
diff --git a/views/ngXosViews/sampleView/src/js/main.js b/views/ngXosViews/sampleView/src/js/main.js
index f8473b6..153d6f2 100644
--- a/views/ngXosViews/sampleView/src/js/main.js
+++ b/views/ngXosViews/sampleView/src/js/main.js
@@ -67,6 +67,21 @@
exclude: ['password'],
formName: 'myForm',
fields: {
+ firstname: {
+ validators: {
+ minlength: 10
+ }
+ },
+ lastname: {
+ validators: {
+ maxlength: 3
+ }
+ },
+ user_url: {
+ validators: {
+ required: true
+ }
+ }
},
actions: [
{
@@ -83,7 +98,7 @@
// retrieving user list
Users.query().$promise
.then((users) => {
- this.users = users.concat(users).concat(users);
+ this.users = users.concat(users).concat(users).concat(users);
})
.catch((e) => {
throw new Error(e);
diff --git a/views/ngXosViews/sampleView/src/templates/users-list.tpl.html b/views/ngXosViews/sampleView/src/templates/users-list.tpl.html
index 17ad68f..f79f9ba 100644
--- a/views/ngXosViews/sampleView/src/templates/users-list.tpl.html
+++ b/views/ngXosViews/sampleView/src/templates/users-list.tpl.html
@@ -7,7 +7,7 @@
<div class="row">
<div class="col-xs-12">
- <xos-form ng-model="vm.users[0]" config="vm.formConfig"></xos-form>
+ <!-- <xos-form ng-model="vm.users[0]" config="vm.formConfig"></xos-form> -->
</div>
</div>