xing-framework 0.0.3 → 0.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/default_configuration/base_app/Gemfile.lock +4 -4
- data/default_configuration/base_app/backend/Gemfile +1 -1
- data/default_configuration/base_app/backend/Gemfile.lock +59 -57
- data/default_configuration/base_app/frontend/npm-shrinkwrap.json +2913 -1280
- data/default_configuration/base_app/frontend/package.json +3 -3
- data/default_configuration/base_app/frontend/src/app/auth/passwords/passwordsControllers.js +6 -6
- data/default_configuration/base_app/frontend/src/app/auth/registrations/registrationsControllers.js +3 -3
- data/default_configuration/base_app/frontend/src/app/auth/sessions/sessionsControllers.js +3 -3
- data/default_configuration/base_app/frontend/src/app/homepage/homepage.tpl.html +6 -6
- data/default_configuration/base_app/frontend/src/common/config.js +2 -2
- metadata +2 -3
- data/default_configuration/base_app/backend/spec/support/log_tests.rb +0 -5
@@ -1,7 +1,7 @@
|
|
1
1
|
{
|
2
2
|
"name": "XING-BASE",
|
3
3
|
"version": "0.0.1",
|
4
|
-
"repository": "git@
|
4
|
+
"repository": "git@github.com:XingFramework/xing-application-base.git",
|
5
5
|
"author": "Logical Reality Design",
|
6
6
|
"homepage": "http://lrdesign.com",
|
7
7
|
"scripts": {
|
@@ -64,10 +64,10 @@
|
|
64
64
|
"singularitygs": "> 0",
|
65
65
|
"traceur": "0.0.87",
|
66
66
|
"uri-templates": "~0.1.5",
|
67
|
-
"xing-framework-sass": "0.0.
|
67
|
+
"xing-framework-sass": "0.0.3",
|
68
68
|
"xing-frontend-grunt": "0.0.8",
|
69
69
|
"xing-frontend-token-auth": "0.0.3",
|
70
|
-
"xing-frontend-utils": "0.0.1-
|
70
|
+
"xing-frontend-utils": "0.0.1-beta6",
|
71
71
|
"xing-grunt-revise": "0.0.1",
|
72
72
|
"xing-inflector": "0.0.2",
|
73
73
|
"xing-traceur": "0.0.8"
|
@@ -1,7 +1,7 @@
|
|
1
1
|
import { Controller } from 'a1atscript';
|
2
2
|
|
3
|
-
@Controller('PasswordsRequestCtrl', ['$scope', '$auth', '$state', '$
|
4
|
-
export function PasswordsRequestController( $scope, $auth, $state, $
|
3
|
+
@Controller('PasswordsRequestCtrl', ['$scope', '$auth', '$state', '$xngToast', 'Serializer'])
|
4
|
+
export function PasswordsRequestController( $scope, $auth, $state, $xngToast, Serializer) {
|
5
5
|
$scope.passwordRequest = {
|
6
6
|
email: '',
|
7
7
|
};
|
@@ -17,14 +17,14 @@ export function PasswordsRequestController( $scope, $auth, $state, $lrdToast, Se
|
|
17
17
|
$state.go('root.inner.passwordsRequestSuccess');
|
18
18
|
})
|
19
19
|
.catch(function(resp) {
|
20
|
-
$
|
20
|
+
$xngToast.errorList(resp.data.errors);
|
21
21
|
// handle error response
|
22
22
|
});
|
23
23
|
};
|
24
24
|
}
|
25
25
|
|
26
|
-
@Controller('PasswordsUpdateCtrl', ['$scope', '$auth', '$state', '$
|
27
|
-
export function PasswordsUpdateController( $scope, $auth, $state, $
|
26
|
+
@Controller('PasswordsUpdateCtrl', ['$scope', '$auth', '$state', '$xngToast', '$location', 'Serializer'])
|
27
|
+
export function PasswordsUpdateController( $scope, $auth, $state, $xngToast, $location, Serializer) {
|
28
28
|
$scope.passwordUpdate = {
|
29
29
|
password: '',
|
30
30
|
passwordConfirmation: ''
|
@@ -40,7 +40,7 @@ export function PasswordsUpdateController( $scope, $auth, $state, $lrdToast, $lo
|
|
40
40
|
$state.go('root.inner.passwordsUpdateSuccess');
|
41
41
|
})
|
42
42
|
.catch(function(resp) {
|
43
|
-
$
|
43
|
+
$xngToast.errorList(resp.data.errors, "We could not update your password because:");
|
44
44
|
// handle error response
|
45
45
|
});
|
46
46
|
};
|
data/default_configuration/base_app/frontend/src/app/auth/registrations/registrationsControllers.js
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
import {Controller} from 'a1atscript';
|
2
2
|
|
3
|
-
@Controller('RegistrationsCtrl', ['$scope', '$auth', '$state', '$
|
4
|
-
export default function RegistrationsController( $scope, $auth, $state, $
|
3
|
+
@Controller('RegistrationsCtrl', ['$scope', '$auth', '$state', '$xngToast', 'Serializer'])
|
4
|
+
export default function RegistrationsController( $scope, $auth, $state, $xngToast, Serializer) {
|
5
5
|
$scope.registration = {
|
6
6
|
email: '',
|
7
7
|
emailConfirmation: '',
|
@@ -17,7 +17,7 @@ export default function RegistrationsController( $scope, $auth, $state, $lrdToas
|
|
17
17
|
$state.go('root.inner.registrationsSuccess');
|
18
18
|
})
|
19
19
|
.catch(function(resp) {
|
20
|
-
$
|
20
|
+
$xngToast.errorList(resp.data.errors, "We cannot process your registration because:");
|
21
21
|
// handle error response
|
22
22
|
});
|
23
23
|
};
|
@@ -1,7 +1,7 @@
|
|
1
1
|
import {Controller} from 'a1atscript';
|
2
2
|
|
3
|
-
@Controller('SessionsCtrl', ['$scope', '$auth', '$state', '$
|
4
|
-
export default function SessionsController( $scope, $auth, $state, $
|
3
|
+
@Controller('SessionsCtrl', ['$scope', '$auth', '$state', '$xngToast', 'Serializer', 'authConfig', 'Inflector'])
|
4
|
+
export default function SessionsController( $scope, $auth, $state, $xngToast, Serializer, authConfig, Inflector) {
|
5
5
|
$scope.session = {
|
6
6
|
password: ''
|
7
7
|
};
|
@@ -18,7 +18,7 @@ export default function SessionsController( $scope, $auth, $state, $lrdToast, Se
|
|
18
18
|
$state.go('root.inner.sessionsSuccess');
|
19
19
|
})
|
20
20
|
.catch(function(resp) {
|
21
|
-
$
|
21
|
+
$xngToast.error(resp.errors);
|
22
22
|
// handle error response
|
23
23
|
});
|
24
24
|
};
|
@@ -1,13 +1,13 @@
|
|
1
|
-
<
|
1
|
+
<xng-responsive-menu>
|
2
2
|
<a ui-sref='root.inner.homepage'>Homepage</a>
|
3
|
-
<
|
4
|
-
</
|
5
|
-
</
|
3
|
+
<xng-session-links>
|
4
|
+
</xng-session-links>
|
5
|
+
</xng-responsive-menu>
|
6
6
|
|
7
|
-
<ui-view
|
7
|
+
<ui-view xng-state-attrs></ui-view>
|
8
8
|
|
9
9
|
<footer>
|
10
|
-
<span id="copyright">©
|
10
|
+
<span id="copyright">© 2016 Your Organization Here</span>
|
11
11
|
<a ui-sref='root.inner.sessions' id='sign-in-link'>Sign In</a>
|
12
12
|
<a href='#' xng-unimplemented>Demo Unimplemented Feature</a>
|
13
13
|
</footer>
|
@@ -4,11 +4,11 @@ import { environment } from "./environment.js";
|
|
4
4
|
export var backendUrl = (function(){
|
5
5
|
var cookies = [];
|
6
6
|
if(document.cookie) {
|
7
|
-
cookies = document.cookie.split(
|
7
|
+
cookies = document.cookie.split(/;\s*/);
|
8
8
|
}
|
9
9
|
|
10
10
|
var matches = cookies.filter((cookie) => {
|
11
|
-
return /^
|
11
|
+
return /^xingBackendUrl=/.test(cookie);
|
12
12
|
});
|
13
13
|
|
14
14
|
if(matches.length > 0) {
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: xing-framework
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0
|
4
|
+
version: 0.2.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Evan Dorn
|
@@ -119,7 +119,6 @@ files:
|
|
119
119
|
- default_configuration/base_app/backend/spec/requests/resources_index_spec.rb
|
120
120
|
- default_configuration/base_app/backend/spec/spec_helper.rb
|
121
121
|
- default_configuration/base_app/backend/spec/support/devise_helper.rb
|
122
|
-
- default_configuration/base_app/backend/spec/support/log_tests.rb
|
123
122
|
- default_configuration/base_app/backend/spec/support/session_helpers.rb
|
124
123
|
- default_configuration/base_app/backend/spec/tasks/sample_data_rake_spec.rb
|
125
124
|
- default_configuration/base_app/backend/static-app.ru
|
@@ -235,7 +234,7 @@ rdoc_options:
|
|
235
234
|
- "--main"
|
236
235
|
- doc/README
|
237
236
|
- "--title"
|
238
|
-
- xing-framework-0.0
|
237
|
+
- xing-framework-0.2.0 Documentation
|
239
238
|
require_paths:
|
240
239
|
- lib/
|
241
240
|
required_ruby_version: !ruby/object:Gem::Requirement
|