Merge branch 'v2'

nicinabox · Jan 7, 2017 · 569d001 · 569d001
2 parents 72d426d + 50a90ef
commit 569d001
Show file tree

Hide file tree

Showing 149 changed files with 8,833 additions and 2,205 deletions.
diff --git a/.babelrc b/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets" : ["es2015", "react", "stage-2"]
+}
diff --git a/.bowerrc b/.bowerrc
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,15 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# dependencies
 node_modules
-bower_components
-.tmp
+
+# testing
+coverage
+
+# production
+build
+
+# misc
+.DS_Store
 .env
-public
-experimental
+npm-debug.log
diff --git a/.ruby-gemset b/.ruby-gemset
diff --git a/.ruby-version b/.ruby-version
diff --git a/Gemfile b/Gemfile
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/Procfile b/Procfile
@@ -1 +1 @@
-web: node index.js
+web: node server
diff --git a/app.json b/app.json
@@ -0,0 +1,7 @@
+{
+  "scripts": {
+    "dokku": {
+      "predeploy": "npm run build"
+    }
+  }
+}
diff --git a/bower.json b/bower.json
diff --git a/client/images/teaser-1.png b/client/images/teaser-1.png
diff --git a/client/images/teaser-2.png b/client/images/teaser-2.png
diff --git a/client/images/teaser-3.png b/client/images/teaser-3.png
diff --git a/client/images/wrench.png b/client/images/wrench.png
diff --git a/client/index.html b/client/index.html
diff --git a/client/scripts/application.coffee b/client/scripts/application.coffee
diff --git a/client/scripts/collections/Records.coffee b/client/scripts/collections/Records.coffee
diff --git a/client/scripts/collections/Reminders.coffee b/client/scripts/collections/Reminders.coffee
diff --git a/client/scripts/collections/Vehicles.coffee b/client/scripts/collections/Vehicles.coffee
diff --git a/client/scripts/helpers/application_helpers.coffee b/client/scripts/helpers/application_helpers.coffee
diff --git a/client/scripts/mixins/application_mixins.coffee b/client/scripts/mixins/application_mixins.coffee
diff --git a/client/scripts/mixins/sync.coffee b/client/scripts/mixins/sync.coffee
diff --git a/client/scripts/models/Record.coffee b/client/scripts/models/Record.coffee
diff --git a/client/scripts/models/Reminder.coffee b/client/scripts/models/Reminder.coffee
diff --git a/client/scripts/models/Session.coffee b/client/scripts/models/Session.coffee