From aca7fe210fbabbaaf127f4469c54977ca7c44886 Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Wed, 15 Apr 2015 13:43:40 -0400
Subject: Wanna use semver proper on this doggy

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 1358023..8748ab9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "okcms",
-  "version": "1.0.0",
+  "version": "0.1.0",
   "description": "great",
   "main": "app/index.js",
   "scripts": {
-- 
cgit v1.2.3-70-g09d2


From 16e63ae2965f403a776de4a799446b0afa03dc1c Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Wed, 15 Apr 2015 13:47:39 -0400
Subject: Fix top level npm installs

---
 Readme.md    | 2 +-
 package.json | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/Readme.md b/Readme.md
index b9e5b2d..61296e9 100644
--- a/Readme.md
+++ b/Readme.md
@@ -5,7 +5,7 @@
 
 ## To run:
 
-* cd app/node_modules ; for i in * ; do cd $i ; npm install; cd .. ; done ; cd ../..
+* npm install
 * cd examples
 * node index
 
diff --git a/package.json b/package.json
index 8748ab9..188005c 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
   "description": "great",
   "main": "app/index.js",
   "scripts": {
+    "postinstall": "./install.sh",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "OKFocus",
-- 
cgit v1.2.3-70-g09d2


From 1ddb94a736d5178a933ef5366a6088469a601997 Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Wed, 15 Apr 2015 13:48:31 -0400
Subject: Make grunt dependencies devDependencies

---
 package.json | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 188005c..4336556 100644
--- a/package.json
+++ b/package.json
@@ -12,14 +12,16 @@
   "dependencies": {
     "dotenv": "^1.1.0",
     "express": "^4.12.3",
+    "grunt-dentist": "^0.3.4",
+    "object-assign": "^2.0.0",
+    "q": "^1.2.0"
+  },
+  "devDependencies": {
     "grunt": "^0.4.5",
     "grunt-cli": "^0.1.13",
     "grunt-contrib-clean": "^0.6.0",
     "grunt-contrib-concat": "^0.5.1",
     "grunt-contrib-copy": "^0.8.0",
-    "grunt-contrib-uglify": "^0.9.1",
-    "grunt-dentist": "^0.3.4",
-    "object-assign": "^2.0.0",
-    "q": "^1.2.0"
+    "grunt-contrib-uglify": "^0.9.1"
   }
 }
-- 
cgit v1.2.3-70-g09d2


From de1b9e99923f5c8892b1f28ab5e8d53bee8c39e7 Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Mon, 18 May 2015 23:00:41 -0400
Subject: Add deploy deps + instructions

---
 package.json |  1 +
 site/DEPLOY  | 21 +++++++++++++++++++++
 site/TODO    |  2 ++
 3 files changed, 24 insertions(+)
 create mode 100644 site/DEPLOY
 create mode 100644 site/TODO

(limited to 'package.json')

diff --git a/package.json b/package.json
index 4336556..a8a602f 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "express": "^4.12.3",
     "grunt-dentist": "^0.3.4",
     "object-assign": "^2.0.0",
+    "pm2": "^0.12.15",
     "q": "^1.2.0"
   },
   "devDependencies": {
diff --git a/site/DEPLOY b/site/DEPLOY
new file mode 100644
index 0000000..cedf761
--- /dev/null
+++ b/site/DEPLOY
@@ -0,0 +1,21 @@
+To deploy
+===
+
+`npm bin`/pm2 start index.js
+
+---
+
+The `npm bin` bit resolves the path to the locally installed `pm2`
+command. Could also use a global install.
+
+`npm bin`/pm2 logs
+
+to see logs and
+
+`npm bin`/pm2 list
+
+to see running processes and
+
+`npm bin`/pm2 show [id]
+
+for more process info
diff --git a/site/TODO b/site/TODO
new file mode 100644
index 0000000..c519946
--- /dev/null
+++ b/site/TODO
@@ -0,0 +1,2 @@
+This really should be in its own repo
+At very least, it should have its own package.json
-- 
cgit v1.2.3-70-g09d2


From 27abfdd15714895894565124bcc660b9d6774494 Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Fri, 19 Jun 2015 15:29:19 -0400
Subject: Add 'flag' data type

---
 app/node_modules/okschema/index.js              |  4 ++++
 package.json                                    |  2 +-
 themes/okadmin/public/js/app.js                 | 11 +++++++++++
 themes/okadmin/templates/partials/inputs.liquid | 13 ++++++++++++-
 4 files changed, 28 insertions(+), 2 deletions(-)

(limited to 'package.json')

diff --git a/app/node_modules/okschema/index.js b/app/node_modules/okschema/index.js
index 67f6e42..89b59cc 100644
--- a/app/node_modules/okschema/index.js
+++ b/app/node_modules/okschema/index.js
@@ -69,6 +69,10 @@ var types = {
   'date': {
     parent: 'string',
     assertValid: function(spec, value) {}
+  },
+  'flag': {
+    parent: 'string',
+    assertValid: function(spec, value) {}
   }
 }
 
diff --git a/package.json b/package.json
index a8a602f..50ec3e6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "okcms",
-  "version": "0.1.0",
+  "version": "0.1.10",
   "description": "great",
   "main": "app/index.js",
   "scripts": {
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index d58cb2a..4be0afc 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -181,6 +181,17 @@ var OKAdmin = function(){
       $(el).append(normalizedInput)
     })
 
+    // Modify flags checkboxes such that unchecked ones return "false"
+    // instead of nothing
+    $('.property .flag').each(function(i, el) {
+      var input = el.querySelector('input')
+      var checked = !!input.checked
+      if (!checked) {
+        $(input).attr('value', 'false')
+        input.checked = true
+      }
+    })
+
     $("ol").each(function(){
       $("li", this).each(function(index){
         $(this).find("input,textarea").each(function(){
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index e766558..9c1a26b 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -51,7 +51,7 @@
         </div>
       </div>
 
-    {% elsif type =='date' %}
+    {% elsif type == 'date' %}
 
       <div class="date">
         <input name="{{name}}"
@@ -62,6 +62,17 @@
                >
       </div>
 
+    {% elsif type == 'flag' %}
+
+      <div class="flag">
+        <input name="{{name}}"
+               type="checkbox"
+               {% if spec.value == 'true' %}
+                checked="true"
+               {% endif %}
+               value="true">
+      </div>
+
     {% elsif type == 'tag-list' %}
       <div class="tag-list">
         <input name="{{name}}"
-- 
cgit v1.2.3-70-g09d2


From 9be28b4322a629b8fe7c35e8cdc42eb413c6d84a Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Fri, 3 Jul 2015 11:55:40 -0400
Subject: Protect admin root path with authentication as well

Fixes #5
---
 app/node_modules/okadminview/index.js | 4 +++-
 package.json                          | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'package.json')

diff --git a/app/node_modules/okadminview/index.js b/app/node_modules/okadminview/index.js
index 2a0fcd5..f6a7cdb 100644
--- a/app/node_modules/okadminview/index.js
+++ b/app/node_modules/okadminview/index.js
@@ -118,7 +118,9 @@ function OKAdminView(options) {
     // This should really be mounted on the router, but can't be due to
     // https://github.com/jaredhanson/passport-http/pull/16
     app.use('/admin/', passport.initialize());
-    app.all('/admin/:path*', passport.authenticate('digest', {session: false}));
+    app.all('/admin/(:path*)?', passport.authenticate('digest', {
+      session: false
+    }));
 
     router.get('/', function readIndex(req, res, next) {
       fetchIndexTemplateData(meta, indexQueries).then(function(data) {
diff --git a/package.json b/package.json
index 50ec3e6..1b6b909 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "okcms",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "great",
   "main": "app/index.js",
   "scripts": {
-- 
cgit v1.2.3-70-g09d2


From 206b101481bad2454410bcb5a73b6c46816d43ef Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Thu, 9 Jul 2015 18:14:02 -0400
Subject: Version++

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 1b6b909..f91a986 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "okcms",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "description": "great",
   "main": "app/index.js",
   "scripts": {
-- 
cgit v1.2.3-70-g09d2


From eb2d4cd758eb06abfe9387a33f1e0f0898980d0d Mon Sep 17 00:00:00 2001
From: Sean Fridman <mail@seanfridman.com>
Date: Sat, 12 Dec 2015 16:21:35 +0100
Subject: Implement Twitter service

---
 app/index.js                                       | 15 +++++--
 app/node_modules/okserver/index.js                 |  7 +++-
 app/node_modules/okservices/index.js               | 43 -------------------
 app/node_modules/okservices/oks3/index.js          | 42 +++++++++++++++++++
 app/node_modules/okservices/oks3/package.json      | 15 +++++++
 app/node_modules/okservices/oktwitter/Readme.md    |  6 +++
 app/node_modules/okservices/oktwitter/index.js     | 48 ++++++++++++++++++++++
 app/node_modules/okservices/oktwitter/package.json | 13 ++++++
 app/node_modules/okservices/package.json           |  7 +---
 package.json                                       |  2 +-
 10 files changed, 143 insertions(+), 55 deletions(-)
 delete mode 100644 app/node_modules/okservices/index.js
 create mode 100644 app/node_modules/okservices/oks3/index.js
 create mode 100644 app/node_modules/okservices/oks3/package.json
 create mode 100644 app/node_modules/okservices/oktwitter/Readme.md
 create mode 100644 app/node_modules/okservices/oktwitter/index.js
 create mode 100644 app/node_modules/okservices/oktwitter/package.json

(limited to 'package.json')

diff --git a/app/index.js b/app/index.js
index 2507dd2..6a1c74f 100644
--- a/app/index.js
+++ b/app/index.js
@@ -13,7 +13,8 @@ var OKResource = require('okresource')
 var OKTemplate = require('oktemplate');
 var OKServer = require('okserver');
 var OKSchema = require('okschema');
-var OKImageService = require('okservices').OKImageService;
+var OKS3Service = require('okservices/oks3');
+var OKTwitterService = require('okservices/oktwitter')
 
 require('dotenv').load();
 
@@ -92,12 +93,19 @@ function OKCMS(options) {
 
   // Create services
   if (serviceConfig.s3) {
-    var imageService = OKImageService({
+    var s3Service = OKS3Service({
       express: express,
       s3: serviceConfig.s3,
     });
   }
 
+  if (serviceConfig.twitter) {
+    var twitterService = OKTwitterService({
+      express: express,
+      credentials: serviceConfig.twitter,
+    })
+  }
+
   var server = this._server = new OKServer({
     express: express,
     app: app,
@@ -108,7 +116,8 @@ function OKCMS(options) {
     adminRoot: adminRoot,
     adminPath: adminPath,
     services: {
-      image: imageService
+      s3: s3Service,
+      twitter: twitterService,
     },
     errorHandler: errorHandler
   });
diff --git a/app/node_modules/okserver/index.js b/app/node_modules/okserver/index.js
index 6d0ed17..ee1b4fb 100644
--- a/app/node_modules/okserver/index.js
+++ b/app/node_modules/okserver/index.js
@@ -59,8 +59,11 @@ function OKServer(options) {
   // Application router
   app.use(router);
   // Add services
-  if (services.image) {
-    app.use('/_services/image', services.image.middleware());
+  if (services.s3) {
+    app.use('/_services/image', services.s3.middleware());
+  }
+  if (services.twitter) {
+    app.use('/_services/twitter', services.twitter.middleware())
   }
   // Make sure this lady is last. Checks whether the desired
   // route has a trailing-slash counterpart and redirects there
diff --git a/app/node_modules/okservices/index.js b/app/node_modules/okservices/index.js
deleted file mode 100644
index fbbdbfd..0000000
--- a/app/node_modules/okservices/index.js
+++ /dev/null
@@ -1,43 +0,0 @@
-var skipper = require('skipper');
-
-function OKImageService(options) {
-  if (!(this instanceof OKImageService)) return new OKImageService(options);
-  options = options || {};
-  if (!options.express)
-    throw new Error('Express not provided to OKImageService');
-  if (!options.s3)
-    throw new Error('S3 configuration not provided to OKImageService');
-  var express = options.express;
-
-  var router = express.Router();
-
-  router.use(skipper());
-
-  router.post('/', function(req, res) {
-    // req should have a method `file` on it which is
-    // provided by skipper. Use that to do AWS stuff
-    req.file('image').upload({
-      adapter: require('skipper-s3'),
-      key: options.s3.key,
-      secret: options.s3.secret,
-      bucket: options.s3.bucket,
-      dirname: options.s3.dirname,
-      maxBytes: options.s3.maxbytes,
-      headers: {
-        'x-amz-acl': 'public-read'
-      }
-    }, function (err, uploadedFiles) {
-      res.json(uploadedFiles);
-    });
-  });
-
-  this._middleware = router;
-}
-
-OKImageService.prototype.middleware = function() {
-  return this._middleware;
-};
-
-module.exports = {
-  OKImageService: OKImageService
-};
diff --git a/app/node_modules/okservices/oks3/index.js b/app/node_modules/okservices/oks3/index.js
new file mode 100644
index 0000000..bd0915e
--- /dev/null
+++ b/app/node_modules/okservices/oks3/index.js
@@ -0,0 +1,42 @@
+var skipper = require('skipper');
+var skipperS3 = require('skipper-s3')
+
+function OKS3(options) {
+  if (!(this instanceof OKS3)) return new OKS3(options);
+  options = options || {};
+  if (!options.express)
+    throw new Error('Express not provided to OKS3');
+  if (!options.s3)
+    throw new Error('S3 configuration not provided to OKS3');
+  var express = options.express;
+
+  var router = express.Router();
+
+  router.use(skipper());
+
+  router.post('/', function(req, res) {
+    // req should have a method `file` on it which is
+    // provided by skipper. Use that to do AWS stuff
+    req.file('image').upload({
+      adapter: skipperS3,
+      key: options.s3.key,
+      secret: options.s3.secret,
+      bucket: options.s3.bucket,
+      dirname: options.s3.dirname,
+      maxBytes: options.s3.maxbytes,
+      headers: {
+        'x-amz-acl': 'public-read'
+      }
+    }, function (err, uploadedFiles) {
+      res.json(uploadedFiles);
+    });
+  });
+
+  this._middleware = router;
+}
+
+OKS3.prototype.middleware = function() {
+  return this._middleware;
+};
+
+module.exports = OKS3
diff --git a/app/node_modules/okservices/oks3/package.json b/app/node_modules/okservices/oks3/package.json
new file mode 100644
index 0000000..982fbfe
--- /dev/null
+++ b/app/node_modules/okservices/oks3/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "oks3",
+  "version": "1.0.0",
+  "description": "s3 wassup",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "OKFocus",
+  "license": "None",
+  "dependencies": {
+    "skipper": "^0.5.7",
+    "skipper-s3": "^0.5.5"
+  }
+}
diff --git a/app/node_modules/okservices/oktwitter/Readme.md b/app/node_modules/okservices/oktwitter/Readme.md
new file mode 100644
index 0000000..def73db
--- /dev/null
+++ b/app/node_modules/okservices/oktwitter/Readme.md
@@ -0,0 +1,6 @@
+# oktwitter
+
+## Service to allow auth with Twitter API
+
+Requests to this service proxy to the twitter API, adding proper auth
+credentials along the way
diff --git a/app/node_modules/okservices/oktwitter/index.js b/app/node_modules/okservices/oktwitter/index.js
new file mode 100644
index 0000000..ec4945d
--- /dev/null
+++ b/app/node_modules/okservices/oktwitter/index.js
@@ -0,0 +1,48 @@
+var Twit = require('twit')
+
+/**
+ * Proxy to Twitter API adding auth creds
+ * TODO Technically can be abused by anyone right now.
+ *      Should add some sort of same origin policy.
+ */
+function OKTwitter (options) {
+  if (!(this instanceof OKTwitter)) return new OKTwitter(options)
+  options = options || {}
+  if (!options.express)
+    throw new Error('Express not provided to OKTwitter');
+  if (!options.credentials)
+    throw new Error('Twitter credentials not provided to OKTwitter');
+
+  var express = options.express
+  var router = express.Router()
+  var creds = options.credentials
+  var twitter = new Twit({
+    consumer_key: creds.consumerKey,
+    consumer_secret: creds.consumerSecret,
+    access_token: creds.accessToken,
+    access_token_secret: creds.accessTokenSecret,
+  })
+
+  router.get('*', function (req, res) {
+    twitter.get(req.path.slice(1), req.query, function (err, data) {
+      if (err) {
+        res.status(err.statusCode)
+        res.send(err.twitterReply)
+      } else {
+        res.json(data)
+      }
+    })
+  })
+
+  router.post('*', function (req, res) {
+    throw new Error('Twitter POST requests not implemented')
+  })
+
+  this._router = router
+}
+
+OKTwitter.prototype.middleware = function () {
+  return this._router
+}
+
+module.exports = OKTwitter
diff --git a/app/node_modules/okservices/oktwitter/package.json b/app/node_modules/okservices/oktwitter/package.json
new file mode 100644
index 0000000..ddee2f9
--- /dev/null
+++ b/app/node_modules/okservices/oktwitter/package.json
@@ -0,0 +1,13 @@
+{
+  "name": "oktwitter",
+  "version": "1.0.0",
+  "description": "Allows auth to Twitter API",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "OKFocus",
+  "dependencies": {
+    "twit": "^2.1.1"
+  }
+}
diff --git a/app/node_modules/okservices/package.json b/app/node_modules/okservices/package.json
index 2c95325..2669a49 100644
--- a/app/node_modules/okservices/package.json
+++ b/app/node_modules/okservices/package.json
@@ -6,10 +6,5 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "author": "OKFocus",
-  "license": "None",
-  "dependencies": {
-    "skipper": "^0.5.7",
-    "skipper-s3": "^0.5.5"
-  }
+  "author": "OKFocus"
 }
diff --git a/package.json b/package.json
index f91a986..8587ab7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "okcms",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "description": "great",
   "main": "app/index.js",
   "scripts": {
-- 
cgit v1.2.3-70-g09d2


From bf5e138b769ffb6e2955c294f7bbec517d71f3db Mon Sep 17 00:00:00 2001
From: Sean Fridman <mail@seanfridman.com>
Date: Sat, 12 Dec 2015 18:49:24 +0100
Subject: Fix deps

---
 package.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 8587ab7..2e9c03d 100644
--- a/package.json
+++ b/package.json
@@ -12,9 +12,7 @@
   "dependencies": {
     "dotenv": "^1.1.0",
     "express": "^4.12.3",
-    "grunt-dentist": "^0.3.4",
     "object-assign": "^2.0.0",
-    "pm2": "^0.12.15",
     "q": "^1.2.0"
   },
   "devDependencies": {
@@ -22,6 +20,7 @@
     "grunt-cli": "^0.1.13",
     "grunt-contrib-clean": "^0.6.0",
     "grunt-contrib-concat": "^0.5.1",
+    "grunt-dentist": "^0.3.4",
     "grunt-contrib-copy": "^0.8.0",
     "grunt-contrib-uglify": "^0.9.1"
   }
-- 
cgit v1.2.3-70-g09d2


From 78897bbf3e90152f45a472c69d7a5a86bd6e02fd Mon Sep 17 00:00:00 2001
From: Sean Fridman <mail@seanfridman.com>
Date: Sat, 12 Dec 2015 18:50:40 +0100
Subject: Increment the dang version num

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 2e9c03d..4fdfce2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "okcms",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "description": "great",
   "main": "app/index.js",
   "scripts": {
-- 
cgit v1.2.3-70-g09d2


From d525344670731be9b99e5b7c4e9d7afacf08db8b Mon Sep 17 00:00:00 2001
From: Sean Fridman <mail@seanfridman.com>
Date: Mon, 14 Dec 2015 21:19:14 +0100
Subject: Finally smash S3 upload crash bug

---
 app/node_modules/okservices/oks3/index.js     | 35 +++++++++++++++++----------
 app/node_modules/okservices/oks3/package.json |  4 +--
 package.json                                  |  2 +-
 3 files changed, 25 insertions(+), 16 deletions(-)

(limited to 'package.json')

diff --git a/app/node_modules/okservices/oks3/index.js b/app/node_modules/okservices/oks3/index.js
index bd0915e..d556c20 100644
--- a/app/node_modules/okservices/oks3/index.js
+++ b/app/node_modules/okservices/oks3/index.js
@@ -1,6 +1,12 @@
 var skipper = require('skipper');
 var skipperS3 = require('skipper-s3')
 
+// Hack to prevent this god-forsaken module from crashing our shit
+var d = require('domain').create()
+d.on('error', function (err) {
+  console.error('Stupid error in S3 upload. Image upload probably prematurely canceled')
+})
+
 function OKS3(options) {
   if (!(this instanceof OKS3)) return new OKS3(options);
   options = options || {};
@@ -17,19 +23,22 @@ function OKS3(options) {
   router.post('/', function(req, res) {
     // req should have a method `file` on it which is
     // provided by skipper. Use that to do AWS stuff
-    req.file('image').upload({
-      adapter: skipperS3,
-      key: options.s3.key,
-      secret: options.s3.secret,
-      bucket: options.s3.bucket,
-      dirname: options.s3.dirname,
-      maxBytes: options.s3.maxbytes,
-      headers: {
-        'x-amz-acl': 'public-read'
-      }
-    }, function (err, uploadedFiles) {
-      res.json(uploadedFiles);
-    });
+    d.run(function () {
+      req.file('image').upload({
+        adapter: skipperS3,
+        key: options.s3.key,
+        secret: options.s3.secret,
+        bucket: options.s3.bucket,
+        dirname: options.s3.dirname,
+        maxBytes: options.s3.maxbytes,
+        headers: {
+          'x-amz-acl': 'public-read'
+        }
+      }, function (err, uploadedFiles) {
+        if (err) res.status(500).send(err)
+        res.json(uploadedFiles);
+      });
+    })
   });
 
   this._middleware = router;
diff --git a/app/node_modules/okservices/oks3/package.json b/app/node_modules/okservices/oks3/package.json
index 982fbfe..1d72a26 100644
--- a/app/node_modules/okservices/oks3/package.json
+++ b/app/node_modules/okservices/oks3/package.json
@@ -9,7 +9,7 @@
   "author": "OKFocus",
   "license": "None",
   "dependencies": {
-    "skipper": "^0.5.7",
-    "skipper-s3": "^0.5.5"
+    "skipper": "^0.5.8",
+    "skipper-s3": "^0.5.6"
   }
 }
diff --git a/package.json b/package.json
index 4fdfce2..b7f1105 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "okcms",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "description": "great",
   "main": "app/index.js",
   "scripts": {
-- 
cgit v1.2.3-70-g09d2


From 57026202f9ac0b98cc744734a04bcee362b789a3 Mon Sep 17 00:00:00 2001
From: Sean Fridman <mail@seanfridman.com>
Date: Sun, 20 Dec 2015 03:06:47 +0100
Subject: Date type always defaults to current day

---
 package.json                    |  2 +-
 themes/okadmin/public/js/app.js | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index b7f1105..192685c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "okcms",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "description": "great",
   "main": "app/index.js",
   "scripts": {
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index b313f22..edf9980 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -20,6 +20,20 @@ var OKAdmin = function(){
     }
   })
 
+  // Add default date
+  $('.date input').each(function(i, el){
+    var value = el.getAttribute('value')
+    if (!value) {
+      el.setAttribute('value', toDateInputValue(new Date))
+    }
+
+    function toDateInputValue (date) {
+        var local = new Date(date);
+        local.setMinutes(date.getMinutes() - date.getTimezoneOffset());
+        return local.toJSON().slice(0,10);
+    }
+  })
+
   // initialize our multimedia uploader with an element and a template
   $(".group.media-list").each(function(){
     var parent = this
-- 
cgit v1.2.3-70-g09d2


From 8898bbe48285c7f9f11760ef420cca43d683d5e0 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 28 Mar 2016 13:59:50 -0400
Subject: modify links field to specify text and uri

---
 app/index.js                                    |  1 +
 app/node_modules/okdb/index.js                  |  2 +-
 app/node_modules/okschema/index.js              | 17 +++++++-
 examples/db.json                                |  9 +++-
 examples/index.js                               |  5 ++-
 package.json                                    |  2 +-
 themes/okadmin/public/css/main.css              |  8 ++++
 themes/okadmin/public/js/app.js                 | 34 ++++++---------
 themes/okadmin/templates/partials/inputs.liquid | 56 +++++++++++++++++++------
 9 files changed, 93 insertions(+), 41 deletions(-)

(limited to 'package.json')

diff --git a/app/index.js b/app/index.js
index 6a1c74f..06b1591 100644
--- a/app/index.js
+++ b/app/index.js
@@ -28,6 +28,7 @@ function OKCMS(options) {
 
   var app = express();
   app.enable('strict routing');
+  app.disable('x-powered-by');
 
   var root = this._root = options.root || 'public';
   var adminConfig = options.admin || {};
diff --git a/app/node_modules/okdb/index.js b/app/node_modules/okdb/index.js
index 4820c8c..ad8d9a7 100644
--- a/app/node_modules/okdb/index.js
+++ b/app/node_modules/okdb/index.js
@@ -97,7 +97,7 @@ FSDB.prototype.update = function(collection, id, data) {
   }
 
   var result = chain.assign(cloneDeep(data)).value();
-  if (result ) {
+  if (result) {
     return resolve(cloneDeep(result));
   } else {
     return resolve(null, new Error('Problem updating document'));
diff --git a/app/node_modules/okschema/index.js b/app/node_modules/okschema/index.js
index 330ad6b..82aa13f 100644
--- a/app/node_modules/okschema/index.js
+++ b/app/node_modules/okschema/index.js
@@ -63,8 +63,21 @@ var types = {
     assertValid: function(spec, value) {}
   },
   'tag-list': {
-    parent: 'string',
-    assertValid: function(spec, value) {}
+    parent: [{
+      uri: { type: 'string' },
+      text: { type: 'string' }
+    }],
+    assertValid: function(spec, value) {
+      var message;
+      var actual;
+      if (!value || !value.length) {
+        throw [{
+          message: 'Not an array',
+          expected: JSON.stringify(this.parent),
+          actual: value
+        }];
+      }
+    }
   },
   'date': {
     parent: 'string',
diff --git a/examples/db.json b/examples/db.json
index 20d4510..4319237 100644
--- a/examples/db.json
+++ b/examples/db.json
@@ -99,7 +99,14 @@
       "title": "About Us",
       "body": "Just a small bakery",
       "id": "about",
-      "__index": 1
+      "__index": "1",
+      "links": [
+        {
+          "text": "asdf2",
+          "uri": "asdf"
+        }
+      ],
+      "dateCreated": ""
     },
     {
       "title": "ok...",
diff --git a/examples/index.js b/examples/index.js
index 3e9f509..bf51dfc 100644
--- a/examples/index.js
+++ b/examples/index.js
@@ -10,7 +10,8 @@ var app  = okcms.createApp({
     page: {
       id: {type: 'string'},
       title: {type: 'string'},
-      body: {type: 'text'}
+      body: {type: 'text'},
+      links: {type: 'link-list'},
     },
     bread: {
       type: {type: 'string', id: true},
@@ -19,7 +20,7 @@ var app  = okcms.createApp({
       color: {type: 'enum', options: ["red","blue","green"]},
       video: {type: 'video'},
       images: {type: 'captioned-image-list'}
-    }
+    },
   },
 
   resources: [
diff --git a/package.json b/package.json
index 192685c..faf3cc9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "okcms",
-  "version": "0.1.18",
+  "version": "0.1.19",
   "description": "great",
   "main": "app/index.js",
   "scripts": {
diff --git a/themes/okadmin/public/css/main.css b/themes/okadmin/public/css/main.css
index a5fbdeb..9289fdf 100644
--- a/themes/okadmin/public/css/main.css
+++ b/themes/okadmin/public/css/main.css
@@ -305,6 +305,14 @@ button, input[type=submit] {
 .main.resource form .video-element input[type=text] {
   width: 15em;
 }
+.main.resource form .group input[type=text].link-input,
+.main.resource form .group input[type=text].link-input-new {
+  width: 13.05em;
+  padding: 0 0 0 0.5em;
+}
+.main.resource form .links li {
+  height: auto;
+}
 .main .link-list .add-link-btn,
 .main .link-list .remove-link-btn {
   margin: 0;
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index edf9980..17b35d0 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -120,35 +120,25 @@ var OKAdmin = function(){
     e.stopPropagation()
     var $delegate = $(e.delegateTarget)
     var $list = $delegate.find('.links')
-    var length = $list.find('input').length
-    var name = $delegate.parent('.property').data('name')
-    var $new = $delegate.find('.link-input-new')
-    var input = document.createElement('input')
-    var delBtn = document.createElement('button')
-    var inputName = name + '[' + length + ']'
-    $(input).attr({
-      name: inputName,
-      type: 'text',
-      value: $new.val()
-    })
-    $list.append(input)
-    $(delBtn).addClass('remove-link-btn')
-    $(delBtn).data('for', inputName)
-    delBtn.innerHTML = '-'
-    $list.append(delBtn)
-    $new.val('')
+    var $linkText = $delegate.find(".link-input-new.link-text")
+    var $linkURI = $delegate.find(".link-input-new.link-uri")
+    
+    var template = $delegate.find(".link-template").html()
+    var $el = $(template)
+    $el.find(".link-text").val( $linkText.val() )
+    $el.find(".link-uri").val( $linkURI.val() )
+    $list.append($el)
+    console.log($list, template)
+    $linkText.val("")
+    $linkURI.val("")
   })
 
   // Remove a link from the list
   $('.link-list').on('click', '.remove-link-btn', function(e) {
     e.preventDefault()
     e.stopPropagation()
-    var $delegate = $(e.delegateTarget)
     var $target = $(e.target)
-    var inputName = $target.data('for')
-    var $input = $delegate.find('[name="' + inputName + '"]')
-    $input.remove()
-    $target.remove()
+    $target.closest("li").remove()
   })
 
   // fix post indexing in list-driven inputs
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index c6efc68..55d5fb8 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -79,26 +79,58 @@
                value="{{spec.value}}"
                placeholder="Enter a comma separated list of tags.">
       </div>
-    {% elsif type == 'link-list' %}
 
+    {% elsif type == 'link-list' %}
       <div class="link-list group">
         <div class="links">
-          {% for url in spec.value %}
-            <input
-                name="{{name}}[{{forloop.index0}}]"
-                value="{{url}}"
-                type="text"
-                class="link-input">
-            <button class="remove-link-btn"
-                    data-for="{{name}}[{{forloop.index0}}]">
-              -
-            </button>
+          {% for link in spec.value %}
+            <li>
+              <input
+                  name="{{name}}[][text]"
+                  value="{{link.text}}"
+                  type="text"
+                  placeholder="Link text"
+                  class="link-input link-text">
+              <input
+                  name="{{name}}[][uri]"
+                  value="{{link.uri}}"
+                  type="text"
+                  placeholder="URL"
+                  class="link-input link-uri">
+              <button class="remove-link-btn">
+                -
+              </button>
+            </li>
           {% endfor %}
         </div>
         <input type="text"
-               class="link-input-new"
+               class="link-input-new link-text"
+               placeholder="Link text">
+        <input type="text"
+               class="link-input-new link-uri"
                placeholder="http://www.example.com">
         <button class="add-link-btn">+</button>
+
+        <script type="text/html" class="link-template">
+          <li>
+            <input
+                name="{{name}}[][text]"
+                value=""
+                type="text"
+                placeholder="Link text"
+                class="link-input link-text">
+            <input
+                name="{{name}}[][uri]"
+                value=""
+                type="text"
+                placeholder="URL"
+                class="link-input link-uri">
+            <button class="remove-link-btn">
+              -
+            </button>
+          </li>
+        </script>
+
       </div>
 
     {% elsif type == 'media-list' %}
-- 
cgit v1.2.3-70-g09d2


From 3ae6b122cbb6e3491677fd79e2d0c1b1a506db93 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 4 Apr 2016 19:43:34 -0400
Subject: Improve response for mp4 videos in parser

---
 package.json                       | 2 +-
 themes/okadmin/public/js/parser.js | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index faf3cc9..09b24c8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "okcms",
-  "version": "0.1.19",
+  "version": "0.1.23",
   "description": "great",
   "main": "app/index.js",
   "scripts": {
diff --git a/themes/okadmin/public/js/parser.js b/themes/okadmin/public/js/parser.js
index 95b391c..6c964f7 100644
--- a/themes/okadmin/public/js/parser.js
+++ b/themes/okadmin/public/js/parser.js
@@ -31,6 +31,8 @@ var Parser = {
 		regex: /\.(mp4|webm)(\?.*)?$/i,
 		fetch: function(url, done) {
 			var video = document.createElement("video")
+			var url_parts = url.replace(/\?.*$/, "").split("/")
+			var filename = url_parts[ url_parts.length-1 ]
 			video.addEventListener("loadedmetadata", function(){
 				var width = video.videoWidth, height = video.videoHeight
 				video = null
@@ -38,8 +40,8 @@ var Parser = {
 					url: url,
 					type: "video",
 					token: "",
-					thumbnail: "",
-					title: "",
+					thumbnail: "http://okfocus.s3.amazonaws.com/misc/okcms/video.png",
+					title: filename,
 					width: width,
 					height: height,
 				})
-- 
cgit v1.2.3-70-g09d2


From 39b95380e6f81734d8a54bfbbfda13216d400247 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 5 Apr 2016 10:26:51 -0400
Subject: bump to v0.1.24

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 09b24c8..c95a2bc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "okcms",
-  "version": "0.1.23",
+  "version": "0.1.24",
   "description": "great",
   "main": "app/index.js",
   "scripts": {
-- 
cgit v1.2.3-70-g09d2


From 56580705e3a62eaf1c498c1c0456fc33fe3b2f76 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 5 Apr 2016 14:05:35 -0400
Subject: broaden media support

---
 app/node_modules/okserver/index.js              |  2 +-
 app/node_modules/okservices/oks3/index.js       | 54 ++++++++++++++++++--
 examples/db.json                                | 29 ++++++++++-
 examples/index.js                               |  5 ++
 package.json                                    |  2 +-
 themes/okadmin/public/css/main.css              |  3 ++
 themes/okadmin/public/js/app.js                 | 18 ++++++-
 themes/okadmin/public/js/parser.js              | 31 +++++++++--
 themes/okadmin/public/js/upload.js              | 61 ++++++++++++++++------
 themes/okadmin/templates/partials/inputs.liquid | 68 ++++++++++++++++++-------
 10 files changed, 226 insertions(+), 47 deletions(-)

(limited to 'package.json')

diff --git a/app/node_modules/okserver/index.js b/app/node_modules/okserver/index.js
index ee1b4fb..3428565 100644
--- a/app/node_modules/okserver/index.js
+++ b/app/node_modules/okserver/index.js
@@ -60,7 +60,7 @@ function OKServer(options) {
   app.use(router);
   // Add services
   if (services.s3) {
-    app.use('/_services/image', services.s3.middleware());
+    app.use('/_services/s3', services.s3.middleware());
   }
   if (services.twitter) {
     app.use('/_services/twitter', services.twitter.middleware())
diff --git a/app/node_modules/okservices/oks3/index.js b/app/node_modules/okservices/oks3/index.js
index d556c20..dc0ca19 100644
--- a/app/node_modules/okservices/oks3/index.js
+++ b/app/node_modules/okservices/oks3/index.js
@@ -4,7 +4,7 @@ var skipperS3 = require('skipper-s3')
 // Hack to prevent this god-forsaken module from crashing our shit
 var d = require('domain').create()
 d.on('error', function (err) {
-  console.error('Stupid error in S3 upload. Image upload probably prematurely canceled')
+  console.error('Stupid error in S3 upload. Upload probably prematurely canceled')
 })
 
 function OKS3(options) {
@@ -20,9 +20,9 @@ function OKS3(options) {
 
   router.use(skipper());
 
-  router.post('/', function(req, res) {
-    // req should have a method `file` on it which is
-    // provided by skipper. Use that to do AWS stuff
+  // req should have a method `file` on it which is
+  // provided by skipper. Use that to do AWS stuff
+  router.post('/image', function(req, res) {
     d.run(function () {
       req.file('image').upload({
         adapter: skipperS3,
@@ -38,7 +38,51 @@ function OKS3(options) {
         if (err) res.status(500).send(err)
         res.json(uploadedFiles);
       });
-    })
+    });
+  });
+
+  router.post('/audio', function(req, res) {
+    d.run(function () {
+      if (! options.s3.allowAudioUploads) {
+        return res.status(500).json({ error: "audio uploading not permitted" })
+      }
+      req.file('audio').upload({
+        adapter: skipperS3,
+        key: options.s3.key,
+        secret: options.s3.secret,
+        bucket: options.s3.bucket,
+        dirname: options.s3.dirname,
+        maxBytes: options.s3.maxbytesAudio,
+        headers: {
+          'x-amz-acl': 'public-read'
+        }
+      }, function (err, uploadedFiles) {
+        if (err) res.status(500).send(err)
+        res.json(uploadedFiles);
+      });
+    });
+  });
+
+  router.post('/video', function(req, res) {
+    d.run(function () {
+      if (! options.s3.allowVideoUploads) {
+        return res.status(500).json({ error: "video uploading not permitted" })
+      }
+      req.file('video').upload({
+        adapter: skipperS3,
+        key: options.s3.key,
+        secret: options.s3.secret,
+        bucket: options.s3.bucket,
+        dirname: options.s3.dirname,
+        maxBytes: options.s3.maxbytesVideo,
+        headers: {
+          'x-amz-acl': 'public-read'
+        }
+      }, function (err, uploadedFiles) {
+        if (err) res.status(500).send(err)
+        res.json(uploadedFiles);
+      });
+    });
   });
 
   this._middleware = router;
diff --git a/examples/db.json b/examples/db.json
index 1d045c3..3650355 100644
--- a/examples/db.json
+++ b/examples/db.json
@@ -174,7 +174,34 @@
       "title": "Green",
       "__index": 1,
       "dateCreated": "Tue, 05 Apr 2016 15:17:57 GMT",
-      "media": []
+      "media": [
+        {
+          "type": "video",
+          "token": "https://ltho.s3.amazonaws.com/ee12b137-1c8a-400a-87e3-89cbee7b4da6.mp4",
+          "uri": "",
+          "width": "400",
+          "height": "400",
+          "title": "ee12b137-1c8a-400a-87e3-89cbee7b4da6.mp4",
+          "thumb": "http://okfocus.s3.amazonaws.com/misc/okcms/video.png"
+        },
+        {
+          "type": "youtube",
+          "token": "y_35kXCQxN4",
+          "uri": "",
+          "width": "640",
+          "height": "360",
+          "title": "dëf lëöpär¨d¨¨¨¨<>~!@~#!:I!@",
+          "thumb": "http://i.ytimg.com/vi/y_35kXCQxN4/hqdefault.jpg"
+        },
+        {
+          "type": "audio",
+          "token": "http://asdf.us/clouds35.mp3",
+          "uri": "",
+          "duration": "225.645792",
+          "title": "clouds35.mp3",
+          "thumb": "http://okfocus.s3.amazonaws.com/misc/okcms/video.png"
+        }
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/examples/index.js b/examples/index.js
index 81d9241..e9de0a3 100644
--- a/examples/index.js
+++ b/examples/index.js
@@ -40,6 +40,11 @@ var app  = okcms.createApp({
       key: process.env.S3_KEY,
       secret: process.env.S3_SECRET,
       bucket: process.env.S3_BUCKET,
+      allowVideoUploads: true,
+      allowAudioUploads: true,
+      maxsize: 200,
+      maxsizeVideo: 150000000,
+      maxsizeAudio: 150000000,
     }
   },
 
diff --git a/package.json b/package.json
index c95a2bc..c3a7280 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "okcms",
-  "version": "0.1.24",
+  "version": "0.1.27",
   "description": "great",
   "main": "app/index.js",
   "scripts": {
diff --git a/themes/okadmin/public/css/main.css b/themes/okadmin/public/css/main.css
index 2f2d376..15b8781 100644
--- a/themes/okadmin/public/css/main.css
+++ b/themes/okadmin/public/css/main.css
@@ -303,6 +303,7 @@ button, input[type=submit] {
   width: 15em;
   height: 6em;
 }
+.main.resource form .audio-element input[type=text],
 .main.resource form .video-element input[type=text] {
   width: 15em;
 }
@@ -353,10 +354,12 @@ button, input[type=submit] {
   margin: 0; padding: 0;
   cursor: pointer;
 }
+.audio-element:hover .remove,
 .video-element:hover .remove,
 .image-element:hover .remove {
   display: block;
 }
+.audio-element .remove:hover,
 .video-element .remove:hover,
 .image-element .remove:hover {
 	color: red;
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index e79f704..a12f517 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -5,7 +5,8 @@ var OKAdmin = function(){
     var parent = this
     var uploader = new OKUpload ()
     uploader.bind( this )
-    uploader.add = function(url){
+    uploader.add = function(media){
+      var url = media.url
       var imageTemplate = $(".image-template", parent).html()
       var $el = $(imageTemplate)
       $el.find(".uri").val(url)
@@ -46,7 +47,7 @@ var OKAdmin = function(){
       $el.find("img").attr("src", url)
       $("ol", parent).prepend($el)
     }
-    uploader.addVideo = function(media){
+    uploader.addMedia = function(media){
       switch (media.type) {
         case 'youtube':
         case 'vimeo':
@@ -64,6 +65,19 @@ var OKAdmin = function(){
           $el.find("img").attr("src", media.thumbnail )
           $("ol", parent).prepend($el)
           break
+        case 'audio':
+          var audioTemplate = $(".audio-template", parent).html()
+          var $el = $(audioTemplate)
+          $el.addClass("loaded")
+          $el.find(".audio-type").val( media.type )
+          $el.find(".audio-token").val( media.token )
+          $el.find(".audio-uri").val( media.uri )
+          $el.find(".audio-title").val( media.title )
+          $el.find(".audio-thumb").val( media.thumbnail )
+          $el.find(".audio-duration").val( media.duration )
+          $el.find("img").attr("src", media.thumbnail )
+          $("ol", parent).prepend($el)
+          break
         case 'link':
           var linkTemplate = $(".link-template", parent).html()
           var $el = $(linkTemplate)
diff --git a/themes/okadmin/public/js/parser.js b/themes/okadmin/public/js/parser.js
index b4a087d..4ab9a6c 100644
--- a/themes/okadmin/public/js/parser.js
+++ b/themes/okadmin/public/js/parser.js
@@ -52,6 +52,31 @@ var Parser = {
 		tag: function (media) {
 			return '<video src="' + media.url + '">';
 		}
+	}, {
+		type: 'audio',
+		regex: /\.(wav|mp3)(\?.*)?$/i,
+		fetch: function(url, done) {
+			var audio = document.createElement("audio")
+			var url_parts = url.replace(/\?.*$/, "").split("/")
+			var filename = url_parts[ url_parts.length-1 ]
+			audio.addEventListener("loadedmetadata", function(){
+				var duration = audio.duration
+				audio = null
+				done({
+					url: url,
+					type: "audio",
+					token: url,
+					thumbnail: "http://okfocus.s3.amazonaws.com/misc/okcms/audio.png",
+					title: filename,
+					duration: duration,
+				})
+			})
+			audio.src = url
+			audio.load()
+		},
+		tag: function (media) {
+			return '<audio src="' + media.url + '">';
+		}
 	}, {
 		type: 'youtube',
 		regex:  /(?:youtube\.com\/(?:[^\/]+\/.+\/|(?:v|e(?:mbed)?)\/|.*[?&]v=)|youtu\.be\/)([^"&?\/ ]{11})/i,
@@ -116,8 +141,7 @@ var Parser = {
 			// return '<img class="video" type="vimeo" vid="'+media.token+'" src="'+media.thumbnail+'"><span class="playvid">&#9654;</span>';
 			return '<div class="video" style="width: ' + media.width + 'px; height: ' + media.height + 'px; overflow: hidden; position: relative;"><iframe frameborder="0" scrolling="no" seamless="seamless" webkitallowfullscreen="webkitAllowFullScreen" mozallowfullscreen="mozallowfullscreen" allowfullscreen="allowfullscreen" id="okplayer" src="http://player.vimeo.com/video/' + media.token + '?api=1&title=0&byline=0&portrait=0&playbar=0&player_id=okplayer&loop=0&autoplay=0" width="' + media.width + '" height="' + media.height + '" style="position: absolute; top: 0px; left: 0px; width: ' + media.width + 'px; height: ' + media.height + 'px;"></iframe></div>'
 		}
-	},
-	{
+	}, {
 		type: 'soundcloud',
 		regex: /soundcloud.com\/[-a-zA-Z0-9]+\/[-a-zA-Z0-9]+\/?$/i,
 		fetch: function (url, done) {
@@ -128,13 +152,14 @@ var Parser = {
 					+ '&client_id=' 
 					+ '0673fbe6fc794a7750f680747e863b10',
 				success: function(result) {
-				  // console.log(result)
+				  console.log(result)
 					done({
 						url: url,
 						type: "soundcloud",
 						token: result.id,
 						thumbnail: result.artwork_url || result.user.avatar_url,
 						title: result.user.username + " - " + result.title,
+						duration: result.duration,
 						width: 166,
 						height: 166,
 					})
diff --git a/themes/okadmin/public/js/upload.js b/themes/okadmin/public/js/upload.js
index cfc1199..2ce14ad 100644
--- a/themes/okadmin/public/js/upload.js
+++ b/themes/okadmin/public/js/upload.js
@@ -1,6 +1,8 @@
 
 var OKUpload = function(){
-	this.action = "/_services/image"
+	this.action = this.imageAction = "/_services/s3/image"
+	this.videoAction = "/_services/s3/video"
+	this.audioAction = "/_services/s3/audio"
 }
 OKUpload.prototype.bind = function(rapper){
   var uploader = this
@@ -14,18 +16,25 @@ OKUpload.prototype.bind = function(rapper){
   $(".add-url", rapper).on("keydown blur", pressEnter( function(e){
     var url = $(this).val()
     $(this).val("")
-    if (! url) return
-    Parser.parse( url, function(media){
-      console.log(url, media)
-      if (media.type == "image") {
-        uploader.add(url)
-      }
-      else {
-        uploader.addVideo(media)
-      }
-    })
+    uploader.parse(url)
   }))
 }
+OKUpload.prototype.parse = function(url){
+  if (! url) return
+  var uploader = this
+  Parser.parse( url, function(media){
+    console.log(url, media)
+    if (! media) {
+      alert("Not a valid link")
+    }
+    else if (media.type == "image") {
+      uploader.add(media)
+    }
+    else {
+      uploader.addMedia(media)
+    }
+  })
+}
 OKUpload.prototype.handleFileSelect = function(e) {
   e.stopPropagation();
   e.preventDefault();
@@ -33,13 +42,29 @@ OKUpload.prototype.handleFileSelect = function(e) {
   var files = e.dataTransfer ? e.dataTransfer.files : e.target.files;
 
   for (var i = 0, f; f = files[i]; i++) {
-    if ( ! f.type.match('image.*')) {
+    if ( ! f.type.match('image.*') && ! f.type.match('video.*') ) {
       continue;
     }
     this.upload(f)
   }
 }
 OKUpload.prototype.upload = function(f){
+
+  var field, action
+
+  if ( f.type.match('video.*') ) {
+    field = 'video'
+    action = this.videoAction
+  }
+  else if ( f.type.match('audio.*') ) {
+    field = 'audio'
+    action = this.audioAction
+  }
+  else {
+    field = 'image'
+    action = this.imageAction || this.action
+  }
+  
   this.xhrCount += 1
 
   this.$progress.addClass("loading")
@@ -51,10 +76,10 @@ OKUpload.prototype.upload = function(f){
   this.$progress.append($loader)
   
   var fd = new FormData()
-  fd.append('image', f)
+  fd.append(field, f)
 
   var request = new XMLHttpRequest()
-  request.open("POST", this.action, true)
+  request.open("POST", action, true)
  
   request.addEventListener("progress", updateProgress.bind(this));
   request.addEventListener("load", transferComplete.bind(this));
@@ -77,6 +102,7 @@ OKUpload.prototype.upload = function(f){
         this.success( responseData )
       }
       catch (e) {
+        console.log(request.responseText)
         console.log("ERROR PARSING JSON")
       }
     }
@@ -121,12 +147,15 @@ OKUpload.prototype.success = function(data){
     return
   }
   var url = data[0].extra.Location
-  this.add(url)
+  this.parse(url)
 }
 OKUpload.prototype.add = function(media){
   console.log(media)
 }
-OKUpload.prototype.addVideo = function(media){
+OKUpload.prototype.addMedia = function(media){
+  console.log(media)
+}
+OKUpload.prototype.addAudio = function(media){
   console.log(media)
 }
 OKUpload.prototype.error = function(error){
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index e618c61..0cd7f6b 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -9,14 +9,14 @@
 
     {% if type == 'string' %}
       <input
-        name="{{name}}" type="text" value="{{spec.value}}">
+        name="{{name}}" type="text" value="{{spec.value | escape}}">
     {% elsif type == 'text' %}
       <textarea
-        name="{{name}}">{{spec.value}}</textarea>
+        name="{{name}}">{{spec.value | escape}}</textarea>
     {% elsif type == 'number' %}
       <input
         type="number"
-        name="{{name}}" value="{{spec.value}}">
+        name="{{name}}" value="{{spec.value | escape}}">
     {% elsif type == 'enum' or type == 'foreign-key' %}
       <select
         name="{{name}}">
@@ -32,9 +32,9 @@
         <input name="{{name}}[width]" value="{{spec.value.width}}" type="hidden" class="video-width" hidden>
         <input name="{{name}}[height]" value="{{spec.value.height}}" type="hidden" class="video-height" hidden>
         <label>Title</label>
-        <input name="{{name}}[title]" type="text" value="{{spec.value.title}}" class="video-title">
+        <input name="{{name}}[title]" type="text" value="{{spec.value.title | escape}}" class="video-title">
         <label>Thumbnail</label>
-        <input name="{{name}}[thumb]" type="text" value="{{spec.value.thumb}}" class="video-thumb">
+        <input name="{{name}}[thumb]" type="text" value="{{spec.value.thumb | escape}}" class="video-thumb">
       </div>
     {% elsif type == 'image' %}
       <div class="image group {% if spec.value.uri %}loaded{% endif %}">
@@ -47,8 +47,8 @@
         </div>
         <div class="image-element">
           <input class="uri" type="hidden" name="{{name}}[uri]" value="{{spec.value.uri}}">
-          <textarea class="caption" name="{{name}}[caption]">{{spec.value.caption}}</textarea>
-          <img src="{{spec.value.uri}}" alt="{{spec.value.caption}}">
+          <textarea class="caption" name="{{name}}[caption]">{{spec.value.caption | escape}}</textarea>
+          <img src="{{spec.value.uri}}" alt="{{spec.value.caption | escape}}">
           <button class="remove">x</button>
         </div>
       </div>
@@ -78,7 +78,7 @@
     {% elsif type == 'tag-list' %}
       <div class="tag-list">
         <input name="{{name}}"
-               value="{{spec.value}}"
+               value="{{spec.value | escape}}"
                placeholder="Enter a comma separated list of tags.">
       </div>
 
@@ -90,13 +90,13 @@
               <div class="handle"></div>
               <input
                   name="{{name}}[{{forloop.index0}}][text]"
-                  value="{{link.text}}"
+                  value="{{link.text | escape}}"
                   type="text"
                   placeholder="Link text"
                   class="link-input link-text">
               <input
                   name="{{name}}[{{forloop.index0}}][uri]"
-                  value="{{link.uri}}"
+                  value="{{link.uri | escape}}"
                   type="text"
                   placeholder="URL"
                   class="link-input link-uri">
@@ -142,8 +142,8 @@
       <div class="media-list group loaded">
         <div class="fields">
           <div class="add-image-button">
-            <input type="file" accept="image/*" multiple>
-            <button>+ Add images</button>
+            <input type="file" accept="image/*,video/*,audio/*" multiple>
+            <button>+ Add media</button>
           </div>
           <input class="add-url" type="text" placeholder="+ Add Image/Video/Link URL">
         </div>
@@ -177,6 +177,23 @@
           </li>
         </script>
 
+        <script type="text/html" class="audio-template">
+          <li class="audio-element">
+            <div style="float: left">
+            <input name="{{name}}[][type]" type="hidden" class="audio-type" hidden>
+            <input name="{{name}}[][token]" type="hidden" class="audio-token" hidden>
+            <input name="{{name}}[][uri]" type="hidden" class="audio-uri" hidden>
+            <input name="{{name}}[][duration]" value="{{image.duration}}" type="hidden" class="audio-duration" hidden>
+            <label>Caption</label>
+            <input name="{{name}}[][title]" type="text" class="audio-title">
+            <label>Thumbnail</label>
+            <input name="{{name}}[][thumb]" type="text" class="audio-thumb">
+            </div>
+            <img>
+            <button class="remove">x</button>
+          </li>
+        </script>
+
         <script type="text/html" class="link-template">
           <li class="link-element">
             <input class="uri" type="text" name="{{name}}[][uri]" value="">
@@ -197,19 +214,34 @@
                 <input name="{{name}}[{{forloop.index0}}][width]" value="{{image.width}}" type="hidden" class="video-width" hidden>
                 <input name="{{name}}[{{forloop.index0}}][height]" value="{{image.height}}" type="hidden" class="video-height" hidden>
                 <label>Caption</label>
-                <input name="{{name}}[{{forloop.index0}}][title]" value="{{image.title}}" type="text" class="video-title">
+                <input name="{{name}}[{{forloop.index0}}][title]" value="{{image.title | escape}}" type="text" class="video-title">
                 <label>Thumbnail</label>
                 <input name="{{name}}[{{forloop.index0}}][thumb]" value="{{image.thumb}}" type="text" class="video-thumb">
                 </div>
                 <img src="{{image.thumb}}">
                 <button class="remove">x</button>
               </li>
+            {% elsif image.type and (image.type == "audio" or image.type == "soundcloud") %}
+              <li class="audio-element">
+                <div style="float: left">
+                <input name="{{name}}[{{forloop.index0}}][type]" value="{{image.type}}" type="hidden" class="audio-type" hidden>
+                <input name="{{name}}[{{forloop.index0}}][token]" value="{{image.token}}" type="hidden" class="audio-token" hidden>
+                <input name="{{name}}[{{forloop.index0}}][uri]" value="{{image.uri}}" type="hidden" class="audio-uri" hidden>
+                <input name="{{name}}[{{forloop.index0}}][duration]" value="{{image.duration}}" type="hidden" class="audio-duration" hidden>
+                <label>Caption</label>
+                <input name="{{name}}[{{forloop.index0}}][title]" value="{{image.title | escape}}" type="text" class="audio-title">
+                <label>Thumbnail</label>
+                <input name="{{name}}[{{forloop.index0}}][thumb]" value="{{image.thumb}}" type="text" class="audio-thumb">
+                </div>
+                <img src="{{image.thumb}}">
+                <button class="remove">x</button>
+              </li>
             {% elsif image.type and image.type == "link" %}
               <li class="link-element">
                 <label>URL</label>
                 <input class="uri" type="text" name="{{name}}[][uri]" value="{{image.uri}}">
                 <label>Caption</label>
-                <textarea class="caption" name="{{name}}[][caption]" placeholder="Caption">{{image.caption}}</textarea>
+                <textarea class="caption" name="{{name}}[][caption]" placeholder="Caption">{{image.caption | escape}}</textarea>
                 <input type="hidden" name="{{name}}[][type]" value="link">
                 <button class="remove">x</button>
               </li>
@@ -217,7 +249,7 @@
               <li class="image-element">
                 <label>Caption</label>
                 <input type="hidden" name="{{name}}[][uri]" value="{{image.uri}}">
-                <textarea class="caption" name="{{name}}[][caption]">{{image.caption}}</textarea>
+                <textarea class="caption" name="{{name}}[][caption]">{{image.caption | escape}}</textarea>
                 <input type="hidden" name="{{name}}[][type]" value="image">
                 <img src="{{image.uri}}" alt="{{image.caption | strip_html}}">
                 <button class="remove">x</button>
@@ -249,7 +281,7 @@
           {% for image in spec.value %}
             <li class="image-element">
               <input type="hidden" name="{{name}}[{{forloop.index0}}][uri]" value="{{image.uri}}">
-              <textarea class="caption" name="{{name}}[{{forloop.index0}}][caption]">{{image.caption}}</textarea>
+              <textarea class="caption" name="{{name}}[{{forloop.index0}}][caption]">{{image.caption | escape}}</textarea>
               <img src="{{image.uri}}" alt="{{image.caption | strip_html}}">
               <button class="remove">x</button>
             </li>
@@ -282,8 +314,8 @@
               <img src="{{image.uri}}" alt="{{image.caption | strip_html}}">
               <button class="remove">x</button>
               <input type="hidden" name="{{name}}[{{forloop.index0}}][uri]" value="{{image.uri}}">
-              <input class="caption" name="{{name}}[{{forloop.index0}}][label]" value="{{image.label}}" placeholder="Name">
-              <input class="caption" name="{{name}}[{{forloop.index0}}][caption]" value="{{image.caption}}"  placeholder="Email">
+              <input class="caption" name="{{name}}[{{forloop.index0}}][label]" value="{{image.label | escape}}" placeholder="Name">
+              <input class="caption" name="{{name}}[{{forloop.index0}}][caption]" value="{{image.caption | escape}}"  placeholder="Email">
             </li>
           {% endfor %}
         </ol>
-- 
cgit v1.2.3-70-g09d2


From 6c09824946214db696beb59e34ce2e448d504abc Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 5 Apr 2016 17:10:00 -0400
Subject: better max file size stuff

---
 app/index.js                                  |  3 ++-
 app/node_modules/okservices/oks3/index.js     | 34 +++++++++++++++++--------
 app/node_modules/okservices/oks3/package.json |  2 +-
 examples/db.json                              |  8 +++++-
 examples/index.js                             | 10 +++-----
 package.json                                  |  4 +--
 themes/okadmin/public/js/app.js               |  3 ++-
 themes/okadmin/public/js/upload.js            | 36 +++++++++++++++++++++------
 themes/okadmin/templates/partials/head.liquid |  2 +-
 themes/okadmin/templates/partials/tail.liquid |  4 +++
 10 files changed, 76 insertions(+), 30 deletions(-)

(limited to 'package.json')

diff --git a/app/index.js b/app/index.js
index 06b1591..d478a03 100644
--- a/app/index.js
+++ b/app/index.js
@@ -53,7 +53,8 @@ function OKCMS(options) {
   }, metaDefault, metaUser);
 
   var adminMeta = assign({
-      static: withoutTrailingSlash(adminPath)
+      static: withoutTrailingSlash(adminPath),
+      services: options.services,
   }, metaDefault, metaUser);
 
   var schemaConfig = options.schemas || {};
diff --git a/app/node_modules/okservices/oks3/index.js b/app/node_modules/okservices/oks3/index.js
index 97abef0..34c5840 100644
--- a/app/node_modules/okservices/oks3/index.js
+++ b/app/node_modules/okservices/oks3/index.js
@@ -4,6 +4,7 @@ var skipperS3 = require('skipper-s3')
 // Hack to prevent this god-forsaken module from crashing our shit
 var d = require('domain').create()
 d.on('error', function (err) {
+  console.log(err)
   console.error('Stupid error in S3 upload. Upload probably prematurely canceled')
 })
 
@@ -19,6 +20,12 @@ function OKS3(options) {
   if (!options.s3.audio) options.s3.audio = {}
   if (!options.s3.video) options.s3.video = {}
 
+/*
+  // TODO: maxBytes property doesn't work - if you upload a large file,
+  // it will just hang until you reload the browser, and then CRASH.
+  
+  // Make sure maxbytes property is there - it can be a number,
+  // or zero/undefined (for no maximum upload size)
   if (options.s3.maxbytes) {
     if (! ('maxbytes' in options.s3.image))
       options.s3.image.maxbytes = options.s3.maxbytes
@@ -27,7 +34,14 @@ function OKS3(options) {
     if (! ('maxbytes' in options.s3.audio))
       options.s3.audio.maxbytes = options.s3.maxbytes
   }
-  
+*/
+  if (options.s3.image.preserveFilename)
+    options.s3.image.preserveFilename = preserveFilename
+  if (options.s3.video.preserveFilename)
+    options.s3.video.preserveFilename = preserveFilename
+  if (options.s3.audio.preserveFilename)
+    options.s3.audio.preserveFilename = preserveFilename
+
   var express = options.express;
 
   var router = express.Router();
@@ -38,22 +52,22 @@ function OKS3(options) {
   // provided by skipper. Use that to do AWS stuff
   router.post('/image', function(req, res) {
     d.run(function () {
-      req.file('image').upload({
+      var skip = req.file('image').upload({
         adapter: skipperS3,
         key: options.s3.key,
         secret: options.s3.secret,
         bucket: options.s3.bucket,
         dirname: options.s3.dirname,
-        maxBytes: options.s3.image.maxbytes,
-        saveAs: options.s3.image.preserveFilename && preserveFilename,
+        // maxBytes: options.s3.image.maxbytes,
+        saveAs: options.s3.image.preserveFilename,
         headers: {
           'x-amz-acl': 'public-read'
         }
       }, function (err, uploadedFiles) {
-        if (err) res.status(500).send(err)
+        if (err) return res.status(500).send(err)
         res.json(uploadedFiles);
       });
-    });
+   });
   });
 
   router.post('/audio', function(req, res) {
@@ -67,8 +81,8 @@ function OKS3(options) {
         secret: options.s3.secret,
         bucket: options.s3.bucket,
         dirname: options.s3.dirname,
-        maxBytes: options.s3.audio.maxbytes,
-        saveAs: options.s3.audio.preserveFilename && preserveFilename,
+        // maxBytes: options.s3.audio.maxbytes,
+        saveAs: options.s3.audio.preserveFilename,
         headers: {
           'x-amz-acl': 'public-read'
         }
@@ -90,8 +104,8 @@ function OKS3(options) {
         secret: options.s3.secret,
         bucket: options.s3.bucket,
         dirname: options.s3.dirname,
-        maxBytes: options.s3.video.maxbytes,
-        saveAs: options.s3.video.preserveFilename && preserveFilename,
+        // maxBytes: options.s3.video.maxbytes,
+        saveAs: options.s3.video.preserveFilename,
         headers: {
           'x-amz-acl': 'public-read'
         }
diff --git a/app/node_modules/okservices/oks3/package.json b/app/node_modules/okservices/oks3/package.json
index 1d72a26..19a2d2a 100644
--- a/app/node_modules/okservices/oks3/package.json
+++ b/app/node_modules/okservices/oks3/package.json
@@ -9,7 +9,7 @@
   "author": "OKFocus",
   "license": "None",
   "dependencies": {
-    "skipper": "^0.5.8",
+    "skipper": "^0.5.9",
     "skipper-s3": "^0.5.6"
   }
 }
diff --git a/examples/db.json b/examples/db.json
index 3650355..da7c19a 100644
--- a/examples/db.json
+++ b/examples/db.json
@@ -167,7 +167,13 @@
       "title": "Blue",
       "__index": 2,
       "dateCreated": "Tue, 05 Apr 2016 15:17:54 GMT",
-      "media": []
+      "media": [
+        {
+          "uri": "https://ltho.s3.amazonaws.com/okcms-example/f2775199-d700-4b1f-951f-88fda599014e.png",
+          "caption": "",
+          "type": "image"
+        }
+      ]
     },
     {
       "id": "green",
diff --git a/examples/index.js b/examples/index.js
index 147750e..57bce4b 100644
--- a/examples/index.js
+++ b/examples/index.js
@@ -41,12 +41,10 @@ var app  = okcms.createApp({
       secret: process.env.S3_SECRET,
       bucket: process.env.S3_BUCKET,
       dirname: "okcms-example",
-      allowVideoUploads: true,
-      allowAudioUploads: true,
-      preserveFilenames: true,
-      maxsize: 200,
-      maxsizeVideo: 150000000,
-      maxsizeAudio: 150000000,
+      // TODO: maxbytes stuff isn't working, need to change underlying module
+      image: { preserveFilename: false, maxbytes: 20000 },
+      video: { preserveFilename: true, maxbytes: 0 },
+      audio: { preserveFilename: true, maxbytes: 150000000 },
     }
   },
 
diff --git a/package.json b/package.json
index c3a7280..5caef74 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "okcms",
-  "version": "0.1.27",
+  "version": "0.1.26",
   "description": "great",
   "main": "app/index.js",
   "scripts": {
@@ -8,7 +8,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "OKFocus",
-  "license": "None",
+  "license": "LNT",
   "dependencies": {
     "dotenv": "^1.1.0",
     "express": "^4.12.3",
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index a12f517..59fc6ae 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -40,7 +40,8 @@ var OKAdmin = function(){
     var parent = this
     var uploader = new OKUpload ()
     uploader.bind( this )
-    uploader.add = function(url){
+    uploader.add = function(media){
+      var url = media.url
       var imageTemplate = $(".image-template", parent).html()
       var $el = $(imageTemplate)
       $el.find(".uri").val(url)
diff --git a/themes/okadmin/public/js/upload.js b/themes/okadmin/public/js/upload.js
index 6149424..44a34b5 100644
--- a/themes/okadmin/public/js/upload.js
+++ b/themes/okadmin/public/js/upload.js
@@ -1,8 +1,9 @@
 
 var OKUpload = function(){
-	this.action = this.imageAction = "/_services/s3/image"
-	this.videoAction = "/_services/s3/video"
-	this.audioAction = "/_services/s3/audio"
+  this.config = $("#uploadConfig").data()
+  this.imageAction = "/_services/s3/image"
+  this.videoAction = "/_services/s3/video"
+  this.audioAction = "/_services/s3/audio"
 }
 OKUpload.prototype.bind = function(rapper){
   var uploader = this
@@ -42,29 +43,47 @@ OKUpload.prototype.handleFileSelect = function(e) {
   var files = e.dataTransfer ? e.dataTransfer.files : e.target.files;
 
   for (var i = 0, f; f = files[i]; i++) {
-    if ( ! f.type.match('image.*') && ! f.type.match('video.*') ) {
-      continue;
-    }
     this.upload(f)
   }
 }
+OKUpload.prototype.largeFileError = function(file, maxSize) {
+  var your_bytes = bytesToString(file.size)
+  var max_bytes = bytesToString(maxSize)
+  alert("Sorry, your file is too big.\n\n" + file.name + "\n\nYour file: " + your_bytes + "\nMax size: " + max_bytes)
+  function bytesToString (n) {
+    if (n < 1024) return n + " bytes"
+    n /= 1024
+    if (n < 1024) return n.toFixed(1) + " kb"
+    n /= 1024
+    if (n < 1024) return n.toFixed(1) + " mb"
+  }
+}
 OKUpload.prototype.upload = function(f){
 
   var field, action
 
   if ( f.type.match('video.*') ) {
+    if (this.config.videoMaxbytes && f.size > this.config.videoMaxbytes) {
+      return this.largeFileError(f, this.config.videoMaxbytes)
+    }
     field = 'video'
     action = this.videoAction
   }
   else if ( f.type.match('audio.*') ) {
+    if (this.config.audioMaxbytes && f.size > this.config.audioMaxbytes) {
+      return this.largeFileError(f, this.config.audioMaxbytes)
+    }
     field = 'audio'
     action = this.audioAction
   }
   else {
+    if (this.config.imageMaxbytes && f.size > this.config.imageMaxbytes) {
+      return this.largeFileError(f, this.config.imageMaxbytes)
+    }
     field = 'image'
     action = this.imageAction || this.action
   }
-  
+
   this.xhrCount += 1
 
   this.$progress.addClass("loading")
@@ -109,11 +128,13 @@ OKUpload.prototype.upload = function(f){
     console.log(arguments, request)
   }
   function transferError (data) {
+    console.log("Transfer error")
     this.loadCount += 1
     this.hideUploadBars()
     console.log(arguments)
   }
   function transferAbort (data) {
+    console.log("Transfer aborted")
     this.loadCount += 1
     this.hideUploadBars()
     console.log(arguments)
@@ -147,6 +168,7 @@ OKUpload.prototype.success = function(data){
     return
   }
   var url = data[0].extra.Location.replace(/%2F/, '\/')
+  console.log(url)
   this.parse(url)
 }
 OKUpload.prototype.add = function(media){
diff --git a/themes/okadmin/templates/partials/head.liquid b/themes/okadmin/templates/partials/head.liquid
index 7ee4824..e9c27dc 100644
--- a/themes/okadmin/templates/partials/head.liquid
+++ b/themes/okadmin/templates/partials/head.liquid
@@ -10,4 +10,4 @@
       <span class="breadcrumb"><b>{{meta.project}}</b> Admin</span>
       <a class="site-link" href="/">View Site</a>
     </header>
-    <div class="container">
+    <div class="container">
\ No newline at end of file
diff --git a/themes/okadmin/templates/partials/tail.liquid b/themes/okadmin/templates/partials/tail.liquid
index 53823b0..522023b 100644
--- a/themes/okadmin/templates/partials/tail.liquid
+++ b/themes/okadmin/templates/partials/tail.liquid
@@ -1,5 +1,9 @@
     </div> {% comment %} closes container tag {% endcomment %}
     <div id="progress"></div>
+    <div id="uploadConfig"
+      data-image-maxbytes="{{meta.services.s3.image.maxbytes}}"
+      data-audio-maxbytes="{{meta.services.s3.audio.maxbytes}}"
+      data-video-maxbytes="{{meta.services.s3.video.maxbytes}}"></div>
   </body>
   <script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
   <script src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/3.6.0/lodash.min.js"></script>
-- 
cgit v1.2.3-70-g09d2


From 73b530ee61f4982c6d9cd725b9fc8158d9de1f8f Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 7 Apr 2016 11:58:36 -0400
Subject: Fix bug in OKAdminview - spec not being passed to transformData

---
 app/node_modules/okadminview/index.js | 5 +++--
 package.json                          | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'package.json')

diff --git a/app/node_modules/okadminview/index.js b/app/node_modules/okadminview/index.js
index b94c814..bee1e1d 100644
--- a/app/node_modules/okadminview/index.js
+++ b/app/node_modules/okadminview/index.js
@@ -205,7 +205,8 @@ function OKAdminView(options) {
             res.redirect(303, resource.getID(data));
           }).fail(error(req, res, 500));
         } catch (errors) {
-          var templateData = transformData(meta, resource, data);
+          var spec = resource.spec
+          var templateData = transformData(meta, spec, resource, data);
           view.renderResource(req, res, assign(templateData, {errors: errors}));
         }
       }
@@ -247,7 +248,6 @@ function OKAdminView(options) {
       if (!resource) {
         error(req, res, 400)(new Error('No such resource ' + type));
       } else {
-        var spec = resource.spec
         try {
           resource.assertValid(data);
           resource.update(id, data).then(function(updated) {
@@ -255,6 +255,7 @@ function OKAdminView(options) {
             res.redirect(303, '../' + resource.getID(updated));
           }).fail(error(req, res, 500));
         } catch (errors) {
+          var spec = resource.spec
           var templateData = transformData(meta, spec, resource, data);
           view.renderResource(req, res, assign(templateData, {errors: errors}));
         }
diff --git a/package.json b/package.json
index 5caef74..2d5df49 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "okcms",
-  "version": "0.1.26",
+  "version": "0.1.27",
   "description": "great",
   "main": "app/index.js",
   "scripts": {
-- 
cgit v1.2.3-70-g09d2


From 3c33b364b4b3a9fef64a005713979f02fe04d4b9 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 11 Apr 2016 14:49:06 -0400
Subject: draconian json parsing

---
 app/node_modules/okservices/oks3/package.json | 2 +-
 package.json                                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'package.json')

diff --git a/app/node_modules/okservices/oks3/package.json b/app/node_modules/okservices/oks3/package.json
index 35bb4ce..61da414 100644
--- a/app/node_modules/okservices/oks3/package.json
+++ b/app/node_modules/okservices/oks3/package.json
@@ -11,6 +11,6 @@
   "dependencies": {
     "knox": "^0.9.2",
     "multer": "^1.1.0",
-    "node-uuid": "^1.4.7",
+    "node-uuid": "^1.4.7"
   }
 }
diff --git a/package.json b/package.json
index 2d5df49..2a927d5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "okcms",
-  "version": "0.1.27",
+  "version": "0.1.30",
   "description": "great",
   "main": "app/index.js",
   "scripts": {
-- 
cgit v1.2.3-70-g09d2


From 5922279561c1998a3e158c26f951348f4c031928 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 14 Apr 2016 14:17:00 -0400
Subject: support adding custom services per-project

---
 app/index.js                              | 42 ++++++++++++++++++-------------
 app/node_modules/okserver/index.js        | 11 +++-----
 app/node_modules/okservices/oks3/index.js |  3 ---
 package.json                              |  5 ++--
 themes/okadmin/public/js/upload.js        |  3 ---
 5 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'package.json')

diff --git a/app/index.js b/app/index.js
index 1a8f97e..7fd88f4 100644
--- a/app/index.js
+++ b/app/index.js
@@ -94,19 +94,30 @@ function OKCMS(options) {
           errorHandler);
 
   // Create services
-  if (serviceConfig.s3) {
-    var s3Service = OKS3Service({
-      express: express,
-      s3: serviceConfig.s3,
-    });
-  }
-
-  if (serviceConfig.twitter) {
-    var twitterService = OKTwitterService({
-      express: express,
-      credentials: serviceConfig.twitter,
-    })
-  }
+  var services = {}
+  Object.keys(serviceConfig).forEach(function(key){
+    var config = serviceConfig[key]
+    switch (key) {
+      case 's3':
+        services.s3 = OKS3Service({
+          express: express,
+          s3: config,
+        });
+        break
+      case 'twitter':
+        services.twitter = OKTwitterService({
+          express: express,
+          credentials: config,
+        });
+        break
+      default:
+        services[key] = config.lib({
+          express: express,
+          config: config,
+        });
+        break
+    }
+  });
 
   var server = this._server = new OKServer({
     express: express,
@@ -117,10 +128,7 @@ function OKCMS(options) {
     root: root,
     adminRoot: adminRoot,
     adminPath: adminPath,
-    services: {
-      s3: s3Service,
-      twitter: twitterService,
-    },
+    services: services,
     errorHandler: errorHandler
   });
 }
diff --git a/app/node_modules/okserver/index.js b/app/node_modules/okserver/index.js
index 302911d..a89676f 100644
--- a/app/node_modules/okserver/index.js
+++ b/app/node_modules/okserver/index.js
@@ -52,7 +52,7 @@ function OKServer(options) {
    * other middleware.
    */
 
-  // Disable silly express header
+  // Disable x-powered-by express header
   app.disable('x-powered-by')
   // Serve user static files
   app.use(express.static(root));
@@ -61,12 +61,9 @@ function OKServer(options) {
   // Application router
   app.use(router);
   // Add services
-  if (services.s3) {
-    app.use('/_services/s3', services.s3.middleware());
-  }
-  if (services.twitter) {
-    app.use('/_services/twitter', services.twitter.middleware())
-  }
+  Object.keys(services).forEach(function(key){
+    app.use('/_services/' + key, services[key].middleware());
+  })
   // Make sure this lady is last. Checks whether the desired
   // route has a trailing-slash counterpart and redirects there
   app.use(slash());
diff --git a/app/node_modules/okservices/oks3/index.js b/app/node_modules/okservices/oks3/index.js
index c636308..cc40b71 100644
--- a/app/node_modules/okservices/oks3/index.js
+++ b/app/node_modules/okservices/oks3/index.js
@@ -20,9 +20,6 @@ function OKS3(options) {
   if (!options.s3.audio) options.s3.audio = {}
   if (!options.s3.video) options.s3.video = {}
 
-  // TODO: maxBytes property doesn't work - if you upload a large file,
-  // it will just hang until you reload the browser, and then CRASH.
-  
   // Make sure maxbytes property is there - it can be a number,
   // or zero/undefined (for no maximum upload size)
   if (options.s3.maxbytes) {
diff --git a/package.json b/package.json
index 2a927d5..bd5719b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "okcms",
-  "version": "0.1.30",
+  "version": "0.1.31",
   "description": "great",
   "main": "app/index.js",
   "scripts": {
@@ -13,7 +13,8 @@
     "dotenv": "^1.1.0",
     "express": "^4.12.3",
     "object-assign": "^2.0.0",
-    "q": "^1.2.0"
+    "q": "^1.2.0",
+    "request": "^2.71.0"
   },
   "devDependencies": {
     "grunt": "^0.4.5",
diff --git a/themes/okadmin/public/js/upload.js b/themes/okadmin/public/js/upload.js
index da23b1b..6ff7ac9 100644
--- a/themes/okadmin/public/js/upload.js
+++ b/themes/okadmin/public/js/upload.js
@@ -177,9 +177,6 @@ OKUpload.prototype.add = function(media){
 OKUpload.prototype.addMedia = function(media){
   console.log(media)
 }
-OKUpload.prototype.addAudio = function(media){
-  console.log(media)
-}
 OKUpload.prototype.error = function(error){
   throw error
 }
-- 
cgit v1.2.3-70-g09d2


From 1d5c1c1525dbefd7891acbdf7492ee9e62e24e16 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 14 Apr 2016 20:32:43 -0400
Subject: bump version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index bd5719b..619b1c8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "okcms",
-  "version": "0.1.31",
+  "version": "0.1.33",
   "description": "great",
   "main": "app/index.js",
   "scripts": {
-- 
cgit v1.2.3-70-g09d2


From f76ec56f3d70da6359905e9b9666f581599edd4f Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 21 Apr 2016 18:02:31 -0400
Subject: fix issue with single input fields, store image width/height

---
 examples/db.json                                | 24 ++++++++++++++++++++++-
 examples/index.js                               |  6 ++++++
 package.json                                    |  4 ++--
 themes/okadmin/public/css/main.css              |  4 +++-
 themes/okadmin/public/js/app.js                 | 26 ++++++++++++++++---------
 themes/okadmin/templates/partials/inputs.liquid | 18 +++++++++++++++--
 6 files changed, 67 insertions(+), 15 deletions(-)

(limited to 'package.json')

diff --git a/examples/db.json b/examples/db.json
index 8805342..401bf26 100644
--- a/examples/db.json
+++ b/examples/db.json
@@ -153,6 +153,13 @@
       "id": "red",
       "title": "Red",
       "media": [
+        {
+          "uri": "https://ltho.s3.amazonaws.com/okcms-example/a91c4210-080c-11e6-8a7d-f30231d4ec26.png",
+          "width": "800",
+          "height": "800",
+          "caption": "",
+          "type": "image"
+        },
         {
           "uri": "http://asdf.us/",
           "caption": "ASDF",
@@ -160,7 +167,8 @@
         }
       ],
       "__index": 0,
-      "dateCreated": "Mon, 28 Mar 2016 23:02:45 GMT"
+      "dateCreated": "Mon, 28 Mar 2016 23:02:45 GMT",
+      "flagged": false
     },
     {
       "id": "blue",
@@ -210,5 +218,19 @@
       ],
       "flagged": true
     }
+  ],
+  "flour": [
+    {
+      "id": "test",
+      "title": "TEST",
+      "image": {
+        "uri": "https://ltho.s3.amazonaws.com/okcms-example/7be163d0-080b-11e6-8a7d-f30231d4ec26.png",
+        "caption": "",
+        "width": "800",
+        "height": "800"
+      },
+      "__index": 0,
+      "dateCreated": "Thu, 21 Apr 2016 21:52:44 GMT"
+    }
   ]
 }
\ No newline at end of file
diff --git a/examples/index.js b/examples/index.js
index efbfc38..341a50b 100644
--- a/examples/index.js
+++ b/examples/index.js
@@ -29,6 +29,11 @@ var app  = okcms.createApp({
       title: {type: 'string'},
       flagged: {type: 'flag'},
       media: {type: 'media-list'},
+    },
+    flour: {
+      id: {type: 'string', hidden: true},
+      title: {type: 'string'},
+      image: {type: 'image'},
     }
   },
 
@@ -37,6 +42,7 @@ var app  = okcms.createApp({
     { type: 'page', static: {id: 'contact'}},
     { type: 'bread' },
     { type: 'test' },
+    { type: 'flour' },
   ],
 
   services: {
diff --git a/package.json b/package.json
index 619b1c8..971efed 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "okcms",
-  "version": "0.1.33",
-  "description": "great",
+  "version": "0.1.34",
+  "description": "The dopest CMS on the planet.",
   "main": "app/index.js",
   "scripts": {
     "postinstall": "./install.sh",
diff --git a/themes/okadmin/public/css/main.css b/themes/okadmin/public/css/main.css
index 15b8781..e539a71 100644
--- a/themes/okadmin/public/css/main.css
+++ b/themes/okadmin/public/css/main.css
@@ -291,7 +291,9 @@ button, input[type=submit] {
   height: 7em;
 }
 .main.resource form img {
-  width: 10em;
+  width: auto;
+  height: auto;
+  max-width: 10em;
   max-height: 6em;
   border: 0;
 }
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index 59fc6ae..578d99f 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -9,8 +9,10 @@ var OKAdmin = function(){
       var url = media.url
       var imageTemplate = $(".image-template", parent).html()
       var $el = $(imageTemplate)
-      $el.find(".uri").val(url)
-      $el.find("img").attr("src", url)
+      $el.find(".uri").val(media.url)
+      $el.find(".image-width").val(media.width)
+      $el.find(".image-height").val(media.height)
+      $el.find("img").attr("src", media.url)
       $("ol", parent).prepend($el)
     }
   })
@@ -44,8 +46,10 @@ var OKAdmin = function(){
       var url = media.url
       var imageTemplate = $(".image-template", parent).html()
       var $el = $(imageTemplate)
-      $el.find(".uri").val(url)
-      $el.find("img").attr("src", url)
+      $el.find(".uri").val(media.url)
+      $el.find(".image-width").val(media.width)
+      $el.find(".image-height").val(media.height)
+      $el.find("img").attr("src", media.url)
       $("ol", parent).prepend($el)
     }
     uploader.addMedia = function(media){
@@ -103,11 +107,13 @@ var OKAdmin = function(){
     var $el = $(this)
     var uploader = new OKUpload ()
     uploader.bind( this )
-    uploader.add = function(url){
-      console.log(url)
-      $el.find(".uri").val(url)
+    uploader.add = function(media){
+      console.log(media)
+      $el.find(".uri").val(media.url)
       $el.find(".caption").val("")
-      $el.find("img").attr("src", url).show()
+      $el.find(".image-width").val(media.width)
+      $el.find(".image-height").val(media.height)
+      $el.find("img").attr("src", media.url).show()
       $el.addClass("loaded")
     }
   })
@@ -117,6 +123,8 @@ var OKAdmin = function(){
       var $el = $(this).closest(".image")
       $el.removeClass('loaded')
       $el.find(".uri").val("")
+      $el.find(".image-width").val("")
+      $el.find(".image-height").val("")
       $el.find(".caption").val("")
       $el.find("img").attr("src", "")
     }
@@ -141,7 +149,7 @@ var OKAdmin = function(){
       $el.parent().addClass("loaded")
       $el.parent().find(".video-type").val( media.type )
       $el.parent().find(".video-token").val( media.token )
-      $el.parent().find(".video-uri").val( media.uri )
+      $el.parent().find(".video-uri").val( media.url )
       $el.parent().find(".video-title").val( media.title )
       $el.parent().find(".video-thumb").val( media.thumbnail )
       $el.parent().find(".video-width").val( media.width )
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index 373e580..e71f4ad 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -48,6 +48,8 @@
         <div class="image-element">
           <input class="uri" type="hidden" name="{{name}}[uri]" value="{{spec.value.uri}}">
           <textarea class="caption" name="{{name}}[caption]">{{spec.value.caption | escape}}</textarea>
+          <input type="hidden" name="{{name}}[width]" value="{{spec.value.width}}" class="image-width">
+          <input type="hidden" name="{{name}}[height]" value="{{spec.value.height}}" class="image-height">
           <img src="{{spec.value.uri}}" alt="{{spec.value.caption | escape}}">
           <button class="remove">x</button>
         </div>
@@ -154,6 +156,8 @@
             <input class="uri" type="hidden" name="{{name}}[][uri]" value="">
             <textarea class="caption" name="{{name}}[][caption]"></textarea>
             <input type="hidden" name="{{name}}[][type]" value="image">
+            <input type="hidden" name="{{name}}[][width]" class="image-width" hidden>
+            <input type="hidden" name="{{name}}[][height]" class="image-height" hidden>
             <img>
             <button class="remove">x</button>
           </li>
@@ -165,8 +169,8 @@
             <input name="{{name}}[][type]" type="hidden" class="video-type" hidden>
             <input name="{{name}}[][token]" type="hidden" class="video-token" hidden>
             <input name="{{name}}[][uri]" type="hidden" class="video-uri" hidden>
-            <input name="{{name}}[][width]" value="{{image.width}}" type="hidden" class="video-width" hidden>
-            <input name="{{name}}[][height]" value="{{image.height}}" type="hidden" class="video-height" hidden>
+            <input name="{{name}}[][width]" type="hidden" class="video-width" hidden>
+            <input name="{{name}}[][height]" type="hidden" class="video-height" hidden>
             <label>Caption</label>
             <input name="{{name}}[][title]" type="text" class="video-title">
             <label>Thumbnail</label>
@@ -249,6 +253,8 @@
               <li class="image-element">
                 <label>Caption</label>
                 <input type="hidden" name="{{name}}[][uri]" value="{{image.uri}}">
+                <input name="{{name}}[{{forloop.index0}}][width]" value="{{image.width}}" type="hidden" class="image-width" hidden>
+                <input name="{{name}}[{{forloop.index0}}][height]" value="{{image.height}}" type="hidden" class="image-height" hidden>
                 <textarea class="caption" name="{{name}}[][caption]">{{image.caption | escape}}</textarea>
                 <input type="hidden" name="{{name}}[][type]" value="image">
                 <img src="{{image.uri}}" alt="{{image.caption | strip_html}}">
@@ -271,6 +277,8 @@
         <script type="text/html" class="image-template">
           <li class="image-element">
             <input class="uri" type="hidden" name="{{name}}[][uri]" value="">
+            <input type="hidden" name="{{name}}[][width]" class="image-width" hidden>
+            <input type="hidden" name="{{name}}[][height]" class="image-height" hidden>
             <textarea class="caption" name="{{name}}[][caption]"></textarea>
             <img>
             <button class="remove">x</button>
@@ -281,6 +289,8 @@
           {% for image in spec.value %}
             <li class="image-element">
               <input type="hidden" name="{{name}}[{{forloop.index0}}][uri]" value="{{image.uri}}">
+              <input type="hidden" name="{{name}}[{{forloop.index0}}][width]" value="{{image.width}}" class="image-width">
+              <input type="hidden" name="{{name}}[{{forloop.index0}}][height]" value="{{image.height}}" class="image-height">
               <textarea class="caption" name="{{name}}[{{forloop.index0}}][caption]">{{image.caption | escape}}</textarea>
               <img src="{{image.uri}}" alt="{{image.caption | strip_html}}">
               <button class="remove">x</button>
@@ -303,6 +313,8 @@
             <img>
             <button class="remove">x</button>
             <input class="uri" type="hidden" name="{{name}}[][uri]" value="">
+            <input type="hidden" name="{{name}}[][width]" class="image-width">
+            <input type="hidden" name="{{name}}[][height]" class="image-height">
             <input class="caption" name="{{name}}[][label]" placeholder="Name">
             <input class="caption" name="{{name}}[][caption]" placeholder="Email">
           </li>
@@ -314,6 +326,8 @@
               <img src="{{image.uri}}" alt="{{image.caption | strip_html}}">
               <button class="remove">x</button>
               <input type="hidden" name="{{name}}[{{forloop.index0}}][uri]" value="{{image.uri}}">
+              <input type="hidden" name="{{name}}[{{forloop.index0}}][width]" value="{{image.width}}" class="image-width">
+              <input type="hidden" name="{{name}}[{{forloop.index0}}][height]" value="{{image.height}}" class="image-height">
               <input class="caption" name="{{name}}[{{forloop.index0}}][label]" value="{{image.label | escape}}" placeholder="Name">
               <input class="caption" name="{{name}}[{{forloop.index0}}][caption]" value="{{image.caption | escape}}"  placeholder="Email">
             </li>
-- 
cgit v1.2.3-70-g09d2


From 6ca70643c18df738fbad5a4e13b1c48fab9ea430 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Sun, 24 Apr 2016 11:06:48 -0400
Subject: Fix groupBy data not showing up in admin template

---
 package.json                          |  2 +-
 themes/okadmin/templates/index.liquid | 59 ++++++++++++++++++-----------------
 2 files changed, 31 insertions(+), 30 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 971efed..c78669a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "okcms",
-  "version": "0.1.34",
+  "version": "0.1.35",
   "description": "The dopest CMS on the planet.",
   "main": "app/index.js",
   "scripts": {
diff --git a/themes/okadmin/templates/index.liquid b/themes/okadmin/templates/index.liquid
index 8255d99..c8c4aa5 100644
--- a/themes/okadmin/templates/index.liquid
+++ b/themes/okadmin/templates/index.liquid
@@ -17,35 +17,36 @@
         <input type="hidden" name="_method" value="PUT">
         {% if resource.groupBy %}
           {% assign i = 0 %}
-          {% for pair in resource.data[resource.groupBy] %}
-          {% assign group = pair[0] %}
-          {% assign members = pair[1] %}
-            <section class="resource-category {{group}}">
-              <header>
-                <h2>{{group | capitalize}}</h2>
-              </header>
-              <ol class="resource-list">
-                {% for data in members %}
-                  <li>
-                    {% if data.disabled %} <del> {% endif %}
-                      <a href="{{resource.type}}/{{data.id}}/">{{data.title}}</a>
-                    {% if data.disabled %} </del> {% endif %}
-                    <input class="resource-input" type="hidden" name="{{resource.type}}[{{i}}]"
-                        value='{{data | stringify | escape_once}}'>
-                  </li>
-                  {% assign i = i | plus: 1 %}
-                {% endfor %}
-              </ol>
-              <footer>
-                <nav>
-                  <a class="btn cancel-btn" href="#">cancel</a>
-                  <button type="submit"
-                      class="btn save-btn" href="#">save</button>
-                  <a class="btn edit-btn active" href="#">sort</a>
-                  <a class="btn add-btn active" href="{{resource.type}}/__new__/">+</a>
-                </nav>
-              </footer>
-            </section>
+          {% for item in resource.data %}
+            {% for pair in item[resource.groupBy] %}
+              {% assign group = pair[0] %}
+              {% assign members = pair[1] %}
+              <section class="resource-category {{group}}">
+                <header>
+                  <h2>{{group | capitalize}}</h2>
+                </header>
+                <ol class="resource-list">
+                  {% for data in members %}
+                    <li>
+                      {% if data.disabled %} <del> {% endif %}
+                        <a href="{{resource.type}}/{{data.id}}/">{{data.title}}</a>
+                      {% if data.disabled %} </del> {% endif %}
+                      <input class="resource-input" type="hidden" name="{{resource.type}}[{{increment i}}]"
+                          value='{{data | stringify | escape_once}}'>
+                    </li>
+                  {% endfor %}
+                </ol>
+                <footer>
+                  <nav>
+                    <a class="btn cancel-btn" href="#">cancel</a>
+                    <button type="submit"
+                        class="btn save-btn" href="#">save</button>
+                    <a class="btn edit-btn active" href="#">sort</a>
+                    <a class="btn add-btn active" href="{{resource.type}}/__new__/">+</a>
+                  </nav>
+                </footer>
+              </section>
+            {% endfor %}
           {% endfor %}
         {% else %}
           <ol class="resource-list">
-- 
cgit v1.2.3-70-g09d2


From ca79a477d68915e6f61db235dded96dcf223bacd Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 17 Aug 2016 02:41:48 -0400
Subject: bump version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index c78669a..bc2bba6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "okcms",
-  "version": "0.1.35",
+  "version": "0.1.36",
   "description": "The dopest CMS on the planet.",
   "main": "app/index.js",
   "scripts": {
-- 
cgit v1.2.3-70-g09d2