update profile file upload

usemodj · Apr 25, 2015 · 73010ba · 73010ba
1 parent 23ab3cd
commit 73010ba
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 52 deletions.
diff --git a/README.md b/README.md
@@ -26,45 +26,10 @@ $ backend> pm2 start ./bin/forever
 
 - Run production mode:
 
-$ backend> NODE_ENV=production pm2 start ./bin/forever
-
-----------
-
-Running "karma:unit" (karma) task
-Warning: No provider for "framework:jasmine"! (Resolving: framework:jasmine) Use --force to continue.
-
->> $ npm install karma-jasmine --save-dev
-
-
-Warning: Task "express:test" not found. Use --force to continue.
-
-Running "serve" task
-Warning: Task "express:livereload" not found. Use --force to continue.
-
->> $ npm install grunt-express-server --save-dev
-
-Running "express-server:test" (express-server) task
-Fatal error: Server should provide a function called "listen" that acts as http.Server.listen
+// ngminify
+$ frontend> grunt build
 
->> install grunt-express with a "npm install grunt-express --save-dev"
-add a module.exports to your app.js. This is required by grunt-express if you want to avoid a "Fatal error: Server should provide a function called "listen" that acts as http.Server.listen"
- ref. http://davidemoro.blogspot.kr/2013/08/yeoman-express-and-angularjs.html
-
->> vi backend/bin/www
-
-```
-var debug = require('debug')('my-application');
-var app = require('../app');
-
-app.set('port', process.env.PORT || 3000);
-
-var server = app.listen(app.get('port'), function() {
-  //debug('Express server listening on port ' + server.address().port);
-  console.log('Express server listening on port %d in %s mode', server.address().port, app.get('env'));
-});
-
-module.exports = app;
-```
+$ backend> NODE_ENV=production pm2 start ./bin/forever
 
 ---------------------
 On Windows:

diff --git a/backend/app.js b/backend/app.js
@@ -62,10 +62,10 @@ try {
         process.exit(1);
     }
 }
-//app.use(log4js.connectLogger(log4js.getLogger("http"), { level: 'debug' }));
-log4js.configure(path.join(__dirname, './config/log4js.json'));
-if(process.env.NODE_ENV === 'production') app.use(log4js.connectLogger(log4js.getLogger("production"), { level: 'ERROR' }));
-else app.use(log4js.connectLogger(log4js.getLogger("development"), { level: 'DEBUG' }));
+app.use(log4js.connectLogger(log4js.getLogger("http"), { level: (app.get('env') === 'production')? 'error':'debug' }));
+//log4js.configure(path.join(__dirname, './config/log4js.json'));
+//if(process.env.NODE_ENV === 'production') app.use(log4js.connectLogger(log4js.getLogger("production"), { level: 'ERROR' }));
+//else app.use(log4js.connectLogger(log4js.getLogger("development"), { level: 'DEBUG' }));
 
 app.use(cookieParser());
 app.use(bodyParser.json());

diff --git a/backend/controllers/profiles.js b/backend/controllers/profiles.js
@@ -161,23 +161,25 @@ module.exports = {
                     }
                 }
             ], function(err, results){
-                if(err) return res.status(500).json(err);
+                if(err) {
+                    log.error(err);
+                    return res.status(500).json(err);
+                }
                 log.debug('>>results: '+ JSON.stringify(results));
                 Address.get(results.address_id, function(err, address){
                     if(!err) results.address = address;
                     Asset.one({viewable_id: results.id, viewable_type:'Profile'}, function(err, asset){
                         if(!err) results.asset = asset;
                         return res.status(200).json(results); //profile
                     });
-
-                })
-
+                });
             });
         });
     },
 
     saveProfile: function(req, res, next){
         var Profile = req.models.profiles;
+        var Address = req.models.addresses;
         var Asset = req.models.assets;
         var User = req.models.users;
 
@@ -249,10 +251,8 @@ module.exports = {
                                     //log.debug(JSON.stringify(profile2));
                                     return callback(null, profile2);
                                 });
-
                             }
-                        })
-
+                        });
                     }
                 },
                 function(profile, callback) {
@@ -286,8 +286,14 @@ module.exports = {
                 }
             ], function(err, results){
                 //log.info('>> completed task');
-                if(err) return res.status(500).json(err);
-                return res.status(200).json(results); //profile
+                if(err) {
+                    log.error(err);
+                    return res.status(500).json(err);
+                }
+                Address.get(results.address_id, function(err, address) {
+                    if (!err) results.address = address;
+                    return res.status(200).json(results); //profile
+                });
             });
         });
     },
@@ -313,7 +319,7 @@ module.exports = {
                 var thumbPath = (dot > -1)? destPath.substring(0, dot)+ '-th'+ destPath.substring(dot)
                     : destPath + '-th';
 
-                gm(readStream, 'img.jpg').options({imageMagick: true}).resize(thumnailWidth)
+                gm(readStream, 'img.png').options({imageMagick: true}).resize(thumnailWidth)
                     .write(thumbPath, function(err){
                         if(err) {
                             log.error( err);