diff --git a/.hound.yml b/.hound.yml
index 489d9d661..d827f1aef 100644
--- a/.hound.yml
+++ b/.hound.yml
@@ -4,5 +4,6 @@ InlineComment:
Enabled: false
java_script:
enabled: true
+ config_file: config/javascript.json
coffee_script:
enabled: true
diff --git a/app/assets/javascripts/angular-libs/angular.openfarm.js b/app/assets/javascripts/angular-libs/angular.openfarm.js
index beaf0304c..4b2f81135 100644
--- a/app/assets/javascripts/angular-libs/angular.openfarm.js
+++ b/app/assets/javascripts/angular-libs/angular.openfarm.js
@@ -1,4 +1,13 @@
-var openFarmModule = angular.module('openFarmModule', ['ngSanitize']);
+var openFarmApp = angular.module('openFarmApp', [
+ 'mm.foundation',
+ 'ng-rails-csrf',
+ 'ngS3upload',
+ 'openFarmModule',
+]);
+
+var openFarmModule = angular.module('openFarmModule', [
+ 'ngSanitize'
+]);
openFarmModule.factory('guideService', ['$http',
function guideService($http) {
@@ -11,7 +20,7 @@ openFarmModule.factory('guideService', ['$http',
}).success(function (response) {
return callback (true, response.guide);
}).error(function (response, code) {
- return callback(false, response, code)
+ return callback(false, response, code);
});
};
return {
@@ -30,7 +39,7 @@ openFarmModule.factory('userService', ['$http',
}).success(function (response) {
return callback (true, response.user);
}).error(function (response, code) {
- return callback(false, response, code)
+ return callback(false, response, code);
});
};
return {
@@ -42,19 +51,66 @@ openFarmModule.directive('markdown', ['$sanitize',
function markdown($sanitize) {
var converter = new Showdown.converter();
return {
- restrict: 'A',
- link: function (scope, element, attrs) {
- function renderMarkdown() {
- var htmlText = converter.makeHtml(scope.$eval(attrs.markdown) || '');
- element.html($sanitize(htmlText));
- }
- scope.$watch(attrs.markdown, function(){
- renderMarkdown();
- });
- renderMarkdown();
+ restrict: 'A',
+ link: function (scope, element, attrs) {
+ function renderMarkdown() {
+ var htmlText = converter.makeHtml(scope.$eval(attrs.markdown) || '');
+ element.html($sanitize(htmlText));
}
- }
+ scope.$watch(attrs.markdown, function(){
+ renderMarkdown();
+ });
+ renderMarkdown();
+ }
+ };
}]);
+openFarmModule.directive('location', [
+ function location() {
+ var geocoder = new google.maps.Geocoder();
+ return {
+ restrict: 'A',
+ require: '?ngModel',
+ scope: true,
+ controller: ['$scope', '$element', '$attrs',
+ function ($scope, $element, $attrs) {
+ $scope.loadingText = $attrs.loadingText;
+ $scope.getLocation = function(val) {
+ if (geocoder) {
+ geocoder.geocode({ 'address': val }, function (results, status) {
+ if (status == google.maps.GeocoderStatus.OK) {
+ var addresses = [];
+ angular.forEach(results, function(item){
+ addresses.push(item.formatted_address);
+ });
+ $scope.addresses = addresses;
+ }
+ else {
+ console.log("Geocoding failed: " + status);
+ }
+ });
+ }
+ };
+
+ $scope.addresses = [];
+ }],
+ template: '
diff --git a/app/views/gardens/index.html.erb b/app/views/gardens/index.html.erb
new file mode 100644
index 000000000..bbf2bcd6a
--- /dev/null
+++ b/app/views/gardens/index.html.erb
@@ -0,0 +1,6 @@
+
+
+
Garden management is coming soon.
+
Go Home
+
+
\ No newline at end of file
diff --git a/app/views/guides/edit.html.erb b/app/views/guides/edit.html.erb
index c636b0aeb..51fc05cba 100644
--- a/app/views/guides/edit.html.erb
+++ b/app/views/guides/edit.html.erb
@@ -1,5 +1,4 @@
-
@@ -230,3 +229,8 @@
+
+<% content_for(:end_js) do %>
+ <%= javascript_include_tag '//maps.google.com/maps/api/js?sensor=false' %>
+ <%= javascript_include_tag 'guides/edit' %>
+<% end %>
diff --git a/app/views/guides/new.html.erb b/app/views/guides/new.html.erb
index 63bd8044e..c3a136d93 100644
--- a/app/views/guides/new.html.erb
+++ b/app/views/guides/new.html.erb
@@ -1,7 +1,8 @@
-
+<% content_for(:start_js) do %>
+<%= javascript_include_tag '//maps.google.com/maps/api/js?sensor=false' %>
+<% end %>
-
@@ -135,7 +136,11 @@
<%= t('.where_are_you_growing_it') %>
-
@@ -176,3 +181,7 @@
+
+<% content_for(:end_js) do %>
+ <%= javascript_include_tag 'guides/new' %>
+<% end %>
diff --git a/app/views/guides/show.html.erb b/app/views/guides/show.html.erb
index 205f7e7b9..65555082c 100644
--- a/app/views/guides/show.html.erb
+++ b/app/views/guides/show.html.erb
@@ -1,5 +1,4 @@
-
@@ -138,3 +137,7 @@
+
+<% content_for(:end_js) do %>
+ <%= javascript_include_tag 'guides/show' %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 07f5fb823..ae08334f0 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -5,7 +5,8 @@
-
+
@@ -110,7 +114,13 @@
<% end %>
<% if alert %>
- <%= alert %>
+ <% if alert.is_a?(Array) %>
+ <% alert.each do |a| %>
+ <%= a %>
+ <% end %>
+ <% else %>
+ <%= alert %>
+ <% end %>
×
<% end %>
@@ -120,5 +130,8 @@
<% end %>
<%= yield %>
+ <%# Controller specific end JS %>
+ <%= yield(:end_js) %>
+
diff --git a/app/views/pages/home.html.erb b/app/views/pages/home.html.erb
index d4afecaca..ac63484ba 100644
--- a/app/views/pages/home.html.erb
+++ b/app/views/pages/home.html.erb
@@ -69,3 +69,7 @@
+
+
+
<%= t('.openfarm_works_best_when') %>
+
+
+<%= form_for :user, controller: 'users', action: 'finish', method: 'put' do |f| %>
+
+
+
+ <%= t('.where_do_you_farm') %>
+
+ <%= t('.city_or_zip') %>
+
+
+
+
+
+
+ <%# TODO: How do we store these? %>
+
+
+
+
+
+<% end %>
+