fixes

Author: igorrKurr

Brocfile.js

@@ -10,11 +10,6 @@ var bootstrapFonts = pickFiles('bower_components/bootstrap-sass-official/assets/
     destDir: '/assets/bootstrap'
 });
 
-var compileSass = require('broccoli-sass');
-var mainCss = compileSass(['app/styles'], 'app.scss', 'assets/dummy.css');
-
 var mergeTrees = require('broccoli-merge-trees');
 
-module.exports = mergeTrees([app.toTree(), bootstrapFonts, mainCss], {
-	overwrite: true
-});
+module.exports = mergeTrees([app.toTree(), bootstrapFonts]);

app/styles/app.scss app/styles/app.cssapp/styles/app.scss renamed to app/styles/app.css

@@ -37,7 +37,6 @@
     "broccoli-asset-rev": "0.3.1",
     "broccoli-concat": "0.0.12",
     "broccoli-merge-trees": "0.1.4",
-    "broccoli-sass": "^0.2.2",
     "broccoli-static-compiler": "0.1.4",
     "connect-restreamer": "^1.0.0",
     "ember-cli": "0.1.7",

package.json

@@ -43,7 +43,7 @@ module.exports = function(app) {
 
   appRouter.get('/users/:id', function(req, res) {
     if(req.params.id === 'admin'){
-      res.send({user: {id: 1, name: 'testuser', lat: 50, long: 40, zoom: 3}});
+      return res.send({user: {id: 1, name: 'testuser', lat: 50, long: 40, zoom: 3}});
     }
     res.send({user: {id: req.params.id, name: 'testuser', lat: 50, long: 40, zoom: 3}});
   });
@@ -57,7 +57,6 @@ module.exports = function(app) {
   });
 
   appRouter.post('/avatars', function(req, res) {
-//    req.on('data', function(chunk){ console.log(chunk)});
     res.send({avatar: {id: 1, thumb_url: 'http://media-cache-ak0.pinimg.com/236x/0c/e6/7f/0ce67fa7c94da77ab90877e65f3fda87.jpg', url: 'http://www.londra.us/Bristol_Castle.jpg'}});
   });