ICSaaS/createlab — pull request #18 by mwhammond (2014-02-16 11:41:46+00:00)
Title: Marks VCC rush cleaned up and merging back in

Hi Ben,

Here's the cleaned up code from the current site which I think is ready to merge back in. I've cleaned up all the settings stuff, the initial confusion was because .env was hidden on ubuntu so it was only when I read up on the different ways of setting ENV that I could see what was going on! However, for people coming on to the OS project the relationships between settings.yml and .env seemed quite confusing (I know it's because that's how cloudinary says to set it up) so for simplicity I've moved all 4 values environment variables are in .env and these values can simply added on the CLI on Heroku or other production environment or created in one file that can be copy/pasted from Google docs for development. The secret token is generated at boot time in production. Does that sound reasonable?

The event show page is also restored as is the filter on the event index page. There's some updates on the VCC page and I've added a portfolio page (basically a clone of events) and cleaned up the admin form so it has the same ability to upload images, pick dates etc. This page and the admin interface still needs quite a bit of work but the things that are missing require additions to the DB schema so I thought that would be better once we're back on one copy.

Let's discuss how proceed on Heroku / Digital Ocean...