Navigation Menu

Skip to content

Commit

Permalink
Update.
Browse files Browse the repository at this point in the history
  • Loading branch information
abuiles committed Apr 5, 2015
1 parent ef617dc commit 7282bed
Show file tree
Hide file tree
Showing 13 changed files with 54 additions and 38 deletions.
12 changes: 0 additions & 12 deletions Brocfile.js
Expand Up @@ -41,16 +41,4 @@ app.import('bower_components/chartjs/Chart.js', {

app.import('vendor/custom-plugins/_amdize.js');

app.import('vendor/list-view.amd.js', {
exports: {
'list-view/main': ['default'],
'list-view/helper': ['default'],
'list-view/list_item_view': ['default'],
'list-view/list_item_view_mixin': ['default'],
'list-view/list_view': ['default'],
'list-view/list_view_helper': ['default'],
'list-view/list_view_mixin': ['default']
}
});

module.exports = app.toTree();
3 changes: 0 additions & 3 deletions app/app.js
Expand Up @@ -2,7 +2,6 @@ import Ember from 'ember';
import Resolver from 'ember/resolver';
import loadInitializers from 'ember/load-initializers';
import config from './config/environment';
import { setCsrfUrl } from 'rails-csrf/config';

Ember.MODEL_FACTORY_INJECTIONS = true;

Expand All @@ -12,12 +11,10 @@ var App = Ember.Application.extend({
Resolver: Resolver
});

setCsrfUrl(config.railsCsrf.csrfURL);

// requirejs('list-view/main');

loadInitializers(App, 'client');
loadInitializers(App, 'rails-csrf');

// Ember.onerror = function(error) {
// console.log('There was an error', error);
Expand Down
5 changes: 5 additions & 0 deletions app/clients/route.js
@@ -0,0 +1,5 @@
import Ember from 'ember';
import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';

export default Ember.Route.extend(AuthenticatedRouteMixin, {
});
4 changes: 2 additions & 2 deletions app/routes/application.js
Expand Up @@ -7,10 +7,10 @@ export default Ember.Route.extend(ApplicationRouteMixin, {
return this.csrf.fetchToken();
},
actions: {
validSignIn: function() {
sessionAuthenticationSucceeded: function() {
this.transitionTo("dashboard");
},
didSignOut: function() {
sessionInvalidationSucceeded: function() {
this.transitionTo("index");
},
willTransition: function() {
Expand Down
3 changes: 2 additions & 1 deletion app/routes/dashboard.js
@@ -1,6 +1,7 @@
import Ember from 'ember';
import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';

export default Ember.Route.extend({
export default Ember.Route.extend(AuthenticatedRouteMixin, {
model: function() {
return this.store.find('report');
},
Expand Down
2 changes: 2 additions & 0 deletions app/styles/app.scss
@@ -1,3 +1,5 @@
@import 'ember-paper';

*, *:before, *:after {
box-sizing: border-box;
}
Expand Down
1 change: 0 additions & 1 deletion app/templates/clients.hbs

This file was deleted.

4 changes: 2 additions & 2 deletions app/templates/dashboard.hbs
Expand Up @@ -14,7 +14,7 @@
Cartera
{{/paper-tile-left}}
{{#paper-tile-content}}
{{format-money model.balance}}
{{format-money controller.balance}}
{{/paper-tile-content}}
{{/paper-item}}
{{#paper-item}}
Expand All @@ -23,7 +23,7 @@
{{/paper-tile-left}}
{{paper-divider}}
{{#paper-tile-content}}
{{model.debtors}}
{{controller.debtors}}
{{/paper-tile-content}}
{{/paper-item}}
{{/paper-list}}
Expand Down
6 changes: 3 additions & 3 deletions app/templates/login.hbs
Expand Up @@ -12,9 +12,9 @@
{{paper-text label="Password" type="password" value=password}}
<p>
{{#paper-button
classNames="md-primary"
noink=true
action="authenticate"}}
classNames="md-primary"
noink=true
action="authenticate"}}
Guardar
{{/paper-button}}
</p>
Expand Down
12 changes: 6 additions & 6 deletions bower.json
Expand Up @@ -2,8 +2,8 @@
"name": "client",
"dependencies": {
"jquery": "^1.11.1",
"ember": "canary",
"ember-data": "canary",
"ember": "1.12.0-beta.1",
"ember-data": "1.0.0-beta.16.1",
"ember-resolver": "~0.1.11",
"loader.js": "ember-cli/loader.js#1.0.1",
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
Expand All @@ -16,11 +16,11 @@
"momentjs": "~2.6.0",
"chartjs": "1.0.1-beta.3",
"ember-simple-auth": "0.7.3",
"hammerjs": "~2.0.4",
"list-view": "emberjs/list-view"
"hammerjs": "~2.0.4"
},
"resolutions": {
"ember": "canary",
"ember-data": "canary"
"jquery": "^1.11.1",
"qunit": "~1.17.1",
"ember": "1.12.0-beta.1"
}
}
9 changes: 9 additions & 0 deletions config/environment.js
Expand Up @@ -52,5 +52,14 @@ module.exports = function(environment) {
authorizer: 'simple-auth-authorizer:devise'
};

ENV.contentSecurityPolicy = {
'default-src': "'none'",
'script-src': "'self'",
'font-src': "'self' https://fonts.gstatic.com",
'connect-src': "'self'",
'img-src': "'self'",
'media-src': "'self'"
};

return ENV;
};
17 changes: 9 additions & 8 deletions package.json
Expand Up @@ -20,7 +20,9 @@
"license": "MIT",
"devDependencies": {
"broccoli-asset-rev": "^2.0.0",
"ember-cli": "0.1.14",
"broccoli-autoprefixer": "^2.1.0",
"broccoli-sass": "^0.6.3",
"ember-cli": "0.2.2",
"ember-cli-6to5": "^3.0.0",
"ember-cli-app-version": "0.3.1",
"ember-cli-build-notifications": "0.0.1",
Expand All @@ -30,24 +32,23 @@
"ember-cli-inject-live-reload": "^1.3.0",
"ember-cli-qunit": "0.3.7",
"ember-cli-simple-auth": "0.7.3",
"ember-cli-simple-auth-devise": "^0.7.3",
"ember-cli-simple-auth-devise": "0.7.3",
"ember-cli-uglify": "1.0.1",
"ember-data": "1.0.0-beta.14.1",
"ember-data": "^1.0.0-beta.16.1",
"ember-export-application-global": "^1.0.2",
"ember-paper": "miguelcobain/ember-paper",
"ember-paper": "0.0.21",
"express": "^4.8.5",
"glob": "^4.0.5"
"glob": "^4.0.5",
"rails-csrf": "^2.0.1"
},
"dependencies": {
"broccoli-gzip": "^0.2.0",
"broccoli-sass": "^0.1.4",
"grunt": "~0.4.2",
"grunt-cli": "~0.1.9",
"grunt-gitinfo": "^0.1.4",
"grunt-redis": "^0.1.1",
"grunt-redis-manifest": "^0.1.3",
"grunt-s3": "^0.2.0-alpha.3",
"http-proxy": "^1.2.0",
"rails-csrf": "^1.0.1"
"http-proxy": "^1.2.0"
}
}
14 changes: 14 additions & 0 deletions tests/unit/clients/route-test.js
@@ -0,0 +1,14 @@
import {
moduleFor,
test
} from 'ember-qunit';

moduleFor('route:clients', {
// Specify the other units that are required for this test.
// needs: ['controller:foo']
});

test('it exists', function(assert) {
var route = this.subject();
assert.ok(route);
});

0 comments on commit 7282bed

Please sign in to comment.