v0.3.0

app.js

@@ -33,8 +33,19 @@ app.configure('development', function(){
 	app.use(express.errorHandler());
 });
 
+function requireLogin(req, res, next) {
+	if (req.session.email) {
+		next(); // allow the next route to run
+	} else {
+		// require the user to log in
+		res.redirect("/login"); // or render a form, etc.
+	}
+}
+
 app.get('/', routes.index);
 
+app.get('/login', routes.login);
+
 app.post('/user/set/username', user.setUsername);
 
 app.post('/auth/verify', auth.verify);
@@ -44,7 +55,11 @@ app.get('/auth/createKeyPair', auth.createKeyPair);
 app.post('/payswarm/register', auth.registerKey);
 app.post('/payswarm/complete', auth.complatePayswarmRegistration);
 
-app.get('/newasset', routes.newasset);
+
+/*
+	New asset
+*/
+app.get('/newasset', requireLogin, routes.newasset);
 app.post('/newasset/process/', assets.createAssetAndListing);
 app.post('/newasset/save', assets.saveAsset);
 
@@ -54,16 +69,29 @@ app.get('/assets/:count', assets.getLatestAssets);
 app.get('/resign/listing/:id', assets.resignListing);
 
 app.get('/assets/asset/:id', assets.getAsset);
+
+app.get('/assets/asset/:id/purchase', assets.purchase);
+app.post('/assets/asset/:id/purchased', assets.purchased);
+app.post('/assets/asset/:id/preview', assets.preview);
+app.get('/assets/asset/:id/preview', assets.preview);
+
 app.get('/listings/listing/:id', assets.getListing);
 
-app.get('/asset/content/:id', function (req, res){
+app.get('/assets/asset/:id/content', function (req, res){
 	res.end('The content!');
 });
 
-app.get('/assets/:id/purchase', assets.purchase);
-
 app.get('/decrypt/:type/:id', assets.decrypt);
 
+app.get('/test', function (req, res){
+	res.render('test');
+});
+
+app.post('/upload', function (req, res) {
+	console.log(req.files);
+	res.json(req.files);
+});
+
 http.createServer(app).listen(app.get('port'), function(){
 	console.log("Express server listening on port " + app.get('port'));
 });

lib/asset.js

@@ -150,9 +150,9 @@ module.exports = function (options) {
 		db.get.asset(query, function (err, doc) {
 			if (err) {
 				console.log('Error getting one asset' + err);
-				cb({});
+				cb(err, {});
 			} else {
-				cb(doc);
+				cb(null, doc);
 			}
 		});
 	}

lib/keys.js

@@ -17,7 +17,6 @@ module.exports = function(opts) {
 				console.log('Error reading keys: ', err);
 			} else {
 				keyPair = JSON.parse(data);
-				console.log('PRIVATE KEY PEM', keyPair);
 				payswarm.decrypt(encryptedMessage, {privateKey: keyPair.publicKey.privateKeyPem}, cb);
 			}
 		});

lib/payswarm.cfg

@@ -3,8 +3,8 @@
   "publicKey": {
     "publicKeyPem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApJTzBuohTPiqliU5Vu8o\nfVZcRIAR16BCVd1CdY65SGOfQuiN3xsK5T4ZGQQiyAogdpYhiGEqB/wgqNr3Wzjv\nC2jxBHLHsiNRGvWkRFqFA8axlqyTkXlSV9fXKbFX0hwrqSByy4JzaNxGA74wYBtH\n2b1nLEIGPE8biB+hywWADPNWSUO/QYm9LRGYuFbl/ieDB9kF8w+JMyzX3yYI45KS\nd979n2ucMgXZ7zMoY9cQKdnaqYINjtMhSW1oTJ03CY5N1v6y5Fx1G2m8fh+X1Qpl\n23LauzIa4T+wWCv7d34kE1DmQEOShtVc8rvpjp6Qz41HOz/bJSa8DAr3xUxPco9G\nGQIDAQAB\n-----END PUBLIC KEY-----\n",
     "privateKeyPem": "-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEApJTzBuohTPiqliU5Vu8ofVZcRIAR16BCVd1CdY65SGOfQuiN\n3xsK5T4ZGQQiyAogdpYhiGEqB/wgqNr3WzjvC2jxBHLHsiNRGvWkRFqFA8axlqyT\nkXlSV9fXKbFX0hwrqSByy4JzaNxGA74wYBtH2b1nLEIGPE8biB+hywWADPNWSUO/\nQYm9LRGYuFbl/ieDB9kF8w+JMyzX3yYI45KSd979n2ucMgXZ7zMoY9cQKdnaqYIN\njtMhSW1oTJ03CY5N1v6y5Fx1G2m8fh+X1Qpl23LauzIa4T+wWCv7d34kE1DmQEOS\nhtVc8rvpjp6Qz41HOz/bJSa8DAr3xUxPco9GGQIDAQABAoIBAHjDMm/oa/bmn4T8\nW06Gvdb5/0nkDzOAzCvk5lcMGrgbIUkfCrqiRSRgpFnOxxaxF5DsKD7BzO1++xfr\nU4UECaL9pZv1/MGhWGnHxHjDUsaqjLRafQ1JUDpUjfRxxFbPhNncjV72oWhX+KfW\nbfiXC+mhKIs5BwpJoZIIY9dsecEFvxZGl7P5OdWYc7+6/ap/CS6r6H9b1a2Z9XZq\nGmHldvQa6mXJn8G/HT2QOKSThRbhQjgNVxhofjUYcSqgBdQFT7rd1BEEK0cDw1eR\nfcie812QefSjRWog1uJjXFuS81zfxTWrepRZuKgscKSwykyhr3AUh59tR25HHJZr\n76kyxAECgYEAzo0959lGa8Zqw3MyjYeaMMBW+Pd27FaoHOsVEGLtPohug4q0o/AO\n8pusO1JBSmpb4/LSgYo46/Gp6iIg5d6t4Ttnwx8n/qPH3t+ezTgsrh9CPf2glSEe\nGvdT3tr1WCFjVV3HiJaXFxUjrkPmEcG/L/QtV4TV+aCMOx5GyckAEikCgYEAy/uI\n5bQQ0c/VVSmi7sWHYcs1GPmy/ahZcagMSB80NUNfG9QhB0YEMler8fDa159YsV9W\nwRhog83Ip8I48IMwTOvBGuBKPsl+Hw9hNG8ksRE4BnXy/y82Jf3xCGM2u+7Cf2/f\n/i9WLli71NFV6LrdJUelvpciANX5a10rkF4JcnECgYBcTnKj8k2uTHXZ8tlctoUJ\n1GsJyE21QOTQR56aPBuaHo6E6q/fs6B6e2d0+0WCZBW8wP+iNItLpiwxHh9lmyZJ\nyaqNYJcXDUp9J6JoQ/pztjR8T6Q8ARjbJDyvE1shj4o81DQfrmzHPAM+FcnzlYpD\ne/PncM3PSRhiMx2ff9wwQQKBgBWrSOWt9UN0oqMDY02eKj2XSrK2g+8yXR4XzgYz\nWmZ2G7pnFIMjSvrWGWwAPB8/zDo7eInWv/OQfspjdY0HQrBJMyBZx0lYOk+uYJMj\nY3Bz9dGp4gB90XDDw0Ey2POp73t+NPtZp/wQbRO0kT3B7BAzxkWy5GfWU0K2iRQz\nCSnhAoGBAMnJ5266sq9ETo0taO15B7pkBLE48+jmLkYMRmu4iHnGYlqJcQxh/evv\nDZ8XbysUGgmT3TcEXqg/lwL8WxXtvqDCOlA7SIncf4tRW1RjcntWfCduWOP8SAe1\n+yXmQQnoqiBCSGswXLFtv3udWCbSJ5rl8e/dKFSMDuDUUXhKLaKK\n-----END RSA PRIVATE KEY-----\n",
-    "id": "https://dev.payswarm.com/i/webpayments/keys/3"
+    "id": "https://dev.payswarm.com/i/webpay/keys/1"
   },
-  "owner": "https://dev.payswarm.com/i/webpayments",
-  "source": "https://dev.payswarm.com/i/webpayments/accounts/primary"
+  "owner": "https://dev.payswarm.com/i/webpay",
+  "source": "https://dev.payswarm.com/i/webpay/accounts/primary"
 }

lib/schemas.js

@@ -10,7 +10,11 @@ var UserSchema = new Schema({
 	publicKeyUrl : String,
     owner : String,
     destination : String,
-    username: String
+    username: String,
+    preferences: {
+    	hasBudget: Boolean
+    },
+    purchases: [String]
 });
 
 var PayeeSchema = {
@@ -38,6 +42,8 @@ var AssetSchema = {
 	},
 	title: String,
 	assetContent: String,
+	assetFiles: [String],
+	assetPreview: [String],
 	assetProvider: String,
 	signature : Object,
 	assetDescription: String,
@@ -61,6 +67,7 @@ var ListingSchema = {
 	payeeRule: Array,
 	asset: String,
 	assetHash: String,
+	_listingHash: String,
 	license: String,
 	licenseHash: String,
 	validFrom: String,

lib/user.js

@@ -16,9 +16,22 @@ module.exports = function (opts) {
 		db.get.user(fields, user, cb);
 	}
 
+	function addPurchase (assetId, user, cb) {
+		get({purchases:1}, user, function (err, user) {
+			if (err) {
+				console.log('error retrieving user');
+				cb(err);
+			} else {
+				user.purchases.push(assetId);
+				user.save(cb);
+			}
+		});
+	}
+
 	userUtils.checkUser = checkUser;
 	userUtils.updateFields = updateFields;
 	userUtils.get = get;
+	userUtils.addPurchase = addPurchase;
 	return userUtils;
 
 };

package.json

@@ -21,17 +21,18 @@
     "mongoose": "~3.6.11",
     "q": "~0.9.6",
     "underscore": "~1.4.4",
-    "highlight.js": "~7.3.0"
+    "highlight.js": "~7.3.0",
+    "formidable": "~1.0.14"
   },
   "subdomain": "webpayments",
   "engines": {
     "node": "0.8.x"
   },
-  "repository" : {
-    "type" : "git",
-    "url" : "https://github.com/piatra/webpayments-marketplace"
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/piatra/webpayments-marketplace"
   },
   "devDependencies": {
     "requirejs": "~2.1.6"
   }
-}
+}

public/javascripts/event-handlers.js

@@ -1,8 +1,10 @@
 define([
 	'message',
 	'event-login',
-	'event-assets'
-	], function (message, loginEv, assetsEv) {
+	'event-assets',
+	'modal',
+	'upload'
+	], function (message, loginEv, assetsEv, modal, upload) {
 
 	var verify = {
 		assertion : function (assertion) {
@@ -40,7 +42,7 @@ define([
 				navigator.id.request();
 			});
 
-			$('.js-handler--create-asset').on('submit', assetsEv.create(assetsEv.assetCreated));
+			// $('.js-handler--create-asset').on('submit', assetsEv.create(assetsEv.assetCreated));
 
 			$('.js-handler--change-username').on('submit', assetsEv.create(assetsEv.usernameChanged));
 
@@ -51,6 +53,8 @@ define([
 				}).success(loginEv.displayPayswarmMsg);
 			}
 
+			//$('input[type=file]').on('change', upload.sendFile);
+
 			assetsEv.loadLatest($('.container--newest'));
 
 		}

public/javascripts/upload.js

@@ -0,0 +1,72 @@
+define([], function () {
+
+	function readFile (file) {
+		var reader = new FileReader();
+		// Closure to capture the file information.
+		reader.onload = (function(theFile) {
+			return function(e) {
+				// FIXME (emit events?)
+				// Render thumbnail.
+				var span = document.createElement('span');
+				span.innerHTML = ['<p><img class="thumb" src="', e.target.result,
+					'" title="', escape(theFile.name), '"/>',
+					'<input type="checkbox" id="', escape(theFile.name) ,'">Is this a preview ?</p>'].join('');
+				$('#preview').html(span);
+			};
+		})(file);
+
+		// Read in the image file as a data URL.
+		reader.readAsDataURL(file);
+	}
+
+	function sendFile () {
+		var formData = new FormData();
+		var file = this.files[0];
+		var progress = document.createElement('progress');
+			progress.value = 0;
+			progress.max = 100;
+			progress.innerHTML = '0%'
+			$(this).replaceWith(progress);
+
+		if (file.type.match('image.*')) {
+			$('button[type=submit]').attr('disabled', true);
+			readFile(file);
+		}
+
+		var attached = $('.js-handler--filesAttached')[0].innerHTML.split(', ');
+		attached.push(escape(file.name));
+		$('.js-handler--filesAttached')[0].innerHTML = attached.join(', ');
+
+		formData.append('myFile', file);
+
+		var xhr = new XMLHttpRequest();
+
+		xhr.open('post', '/upload', true);
+
+		xhr.upload.onprogress = function(e) {
+			if (e.lengthComputable) {
+				var percentage = (e.loaded / e.total) * 100;
+				$('progress').attr('value', percentage).text(percentage + '%');
+			}
+		};
+
+		xhr.onerror = function(e) {
+			console.log('An error occurred while submitting the form. Maybe your file is too big');
+		};
+
+		xhr.onload = function() {
+			if (this.status == 200) {
+				var $fileInput = $('<input type="file" class="topcoat-text-input">');
+				$('progress').replaceWith($fileInput);
+				$fileInput.on('change', sendFile);
+				$('button[type=submit]').attr('disabled', false);
+			}
+		};
+
+		xhr.send(formData);
+	}
+
+	return {
+		sendFile: sendFile
+	}
+})

public/stylesheets/mixins.styl

@@ -0,0 +1,6 @@
+metrics-reset()
+	margin 0
+	padding 0
+
+warningBg = #FFFFBF
+var-item__title-color = #0096dd