updating to use templated layouts

wookiehangover · Nov 27, 2011 · c9af2c0 · c9af2c0
1 parent a282c46
commit c9af2c0
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 14 deletions.
diff --git a/lib/app.js b/lib/app.js
@@ -6,6 +6,14 @@ var
   handlebars = require('handlebars'),
   s3         = require('./s3');
 
+
+function getTemplate( filename ) {
+  var file = path.resolve( './templates', filename + '.hbs' );
+  return fs.readFileSync( file, 'utf8' );
+}
+
+var uploadLayout = handlebars.compile( getTemplate( 'upload' ) );
+
 var app = new strata.Builder();
 
 var root = path.resolve( './public' );
@@ -18,19 +26,16 @@ app.get('/', function(env, callback){
   callback( 200, {}, fs.readFileSync('./public/index.html', 'utf8') );
 });
 
-// POST /
-// Uploads a file to the server.
 app.post("/upload", function (env, callback) {
   var req = new strata.Request(env);
 
   req.params(function (err, params) {
     if (err && strata.handleError(err, env, callback)) {
-        return;
+      return;
     }
 
-    var photo = params.photo;
-
     var error;
+    var photo = params.photo;
 
     if (!photo) {
       error = 'Param "photo" is required';
@@ -49,29 +54,26 @@ app.post("/upload", function (env, callback) {
       if ( err )
         callback( 403, {}, 'something terrible happened whilst reading the file');
 
+      // pass file on to our s3 bucket
       var upload = s3.put( '/test/' + photo.name, {
         'Content-Length': buf.length,
         'Content-Type': photo.type
       });
 
+      // render repsonse page on success
       upload.on('response', function( res ){
         if ( 200 !== res.statusCode )
           return callback( 403, {}, 'something terrible has happened');
 
-        var content = "";
-
-        content += "The photo was uploaded successfully. Here are its properties:";
-        content += "<ul>";
+        var content = {};
 
         ["path", "name", "type", "size"].forEach(function (prop) {
-            content += "<li>" + prop + ": " + photo[prop] + "</li>";
+          content[prop] = photo[prop];
         });
 
-        content += "<li>url: <a href='"+ upload.url +"'>"+ upload.url +"</a></li>";
-
-        content += "</ul>";
+        content.url = upload.url;
 
-        callback(200, {}, content);
+        callback(200, {}, uploadLayout( content ) );
       });
 
       upload.end( buf );

diff --git a/templates/upload.hbs b/templates/upload.hbs
@@ -0,0 +1,17 @@
+<!doctype html public "⚓ ⚓ ⚓">
+<meta charset=utf8>
+<h2>Upload Successful</h2>
+<dl>
+  <dt>url:
+    <dd><a href={{url}}>{{url}}</a>
+  <dt>name:
+    <dd>{{name}}
+  <dt>type:
+    <dd>{{type}}
+  <dt>size:
+    <dd>{{size}}
+  {{#if url}}
+  <dt>image:
+    <dd><a href={{url}}><img src={{url}} alt={{name}}></a>
+  {{/if}}
+</dl>