diff --git a/Gemfile b/Gemfile index f01eced21..7cbe25394 100755 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,4 @@ source 'https://rubygems.org' -source 'https://rails-assets.org' ruby '2.2.0' gem 'rails', '4.1.0' @@ -21,16 +20,20 @@ gem 'mutations' gem 'active_model_serializers', '~> 0.8.3' gem 'ice_cube' -gem 'rails-assets-angular', '~> 1.3' -gem 'rails-assets-ng-sortable' -gem 'rails-assets-js-data' -gem 'rails-assets-js-data-angular' -gem 'rails-assets-lodash' -gem 'rails-assets-jquery' -gem 'rails-assets-pickadate' -gem 'rails-assets-ng-pickadate' -gem 'rails-assets-sio-client' +source 'https://rails-assets.org' do + gem 'rails-assets-angular', '~> 1.3' + gem 'rails-assets-ng-sortable' + gem 'rails-assets-js-data' + gem 'rails-assets-js-data-angular' + gem 'rails-assets-lodash' + gem 'rails-assets-jquery' + gem 'rails-assets-pickadate' + gem 'rails-assets-ng-pickadate' + gem 'rails-assets-sio-client' +end + gem 'react-rails', '~> 1.0' +# gem 'browserify-rails' group :development, :test do gem 'pry' diff --git a/Gemfile.lock b/Gemfile.lock index 112e181a2..0ba4c65c7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -234,6 +234,7 @@ GEM railties (= 4.1.0) sprockets-rails (~> 2.0) rails-assets-angular (1.3.13) + rails-assets-gaearon--redux (3.0.0) rails-assets-jquery (2.1.3) rails-assets-js-data (1.3.0) rails-assets-js-data-angular (2.1.0) @@ -383,15 +384,16 @@ DEPENDENCIES poltergeist pry rails (= 4.1.0) - rails-assets-angular (~> 1.3) - rails-assets-jquery - rails-assets-js-data - rails-assets-js-data-angular - rails-assets-lodash - rails-assets-ng-pickadate - rails-assets-ng-sortable - rails-assets-pickadate - rails-assets-sio-client + rails-assets-angular (~> 1.3)! + rails-assets-gaearon--redux! + rails-assets-jquery! + rails-assets-js-data! + rails-assets-js-data-angular! + rails-assets-lodash! + rails-assets-ng-pickadate! + rails-assets-ng-sortable! + rails-assets-pickadate! + rails-assets-sio-client! rails_12factor react-rails (~> 1.0) rspec diff --git a/app/assets/javascripts/farmbot_app/react/farm_designer.js.jsx b/app/assets/javascripts/farmbot_app/react/farm_designer.js.jsx index 0e4d3b605..607e26f72 100644 --- a/app/assets/javascripts/farmbot_app/react/farm_designer.js.jsx +++ b/app/assets/javascripts/farmbot_app/react/farm_designer.js.jsx @@ -4,6 +4,11 @@ //= require farmbot_app/react/menus/crop_info //= require farmbot_app/react/menus/calendar //= require farmbot_app/react/menus/schedule_creation + +import { createStore } from 'redux'; + +let wow = createStore("WOW"); +debugger; class Crop { constructor(options) { this.name = (options.name || "Untitled Crop"); @@ -37,12 +42,34 @@ Fb.ToolTip = React.createClass({ } }); +Fb.DesignerApp = class extends React.Component { + render() { + return
-
+
Choose a Crop
@@ -47,5 +47,8 @@ Fb.PlantCatalog = class extends React.Component {
Fb.renderCatalog = function() {
- React.render(
Literally
, Fb.leftMenu); + }; diff --git a/app/views/dashboard/ng-partials/farm-designer/_left_side.html.haml b/app/views/dashboard/ng-partials/farm-designer/_left_side.html.haml deleted file mode 100644 index 390d14059..000000000 --- a/app/views/dashboard/ng-partials/farm-designer/_left_side.html.haml +++ /dev/null @@ -1,3 +0,0 @@ -#designer-left - #designer-left-menu-bar - #designer-left-content diff --git a/app/views/dashboard/ng-partials/farm-designer/_middle.html.haml b/app/views/dashboard/ng-partials/farm-designer/_middle.html.haml deleted file mode 100644 index af6c65c13..000000000 --- a/app/views/dashboard/ng-partials/farm-designer/_middle.html.haml +++ /dev/null @@ -1 +0,0 @@ -%div diff --git a/app/views/dashboard/ng-partials/farm-designer/_right_side.html.haml b/app/views/dashboard/ng-partials/farm-designer/_right_side.html.haml deleted file mode 100644 index 6feb24eb6..000000000 --- a/app/views/dashboard/ng-partials/farm-designer/_right_side.html.haml +++ /dev/null @@ -1,3 +0,0 @@ -#designer-right - #designer-right-menu-bar - #designer-right-content diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 189466332..28ce697c2 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -9,6 +9,7 @@ = stylesheet_link_tag "//cdnjs.cloudflare.com/ajax/libs/foundation/5.4.7/css/foundation.min.css" = stylesheet_link_tag "application" = csrf_meta_tags + = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/redux/1.0.1/redux.min.js" = javascript_include_tag "application" %body{'ng-app' => 'FarmBot'} .row diff --git a/app/views/pages/farm_designer.html.erb b/app/views/pages/farm_designer.html.erb new file mode 100644 index 000000000..554caa314 --- /dev/null +++ b/app/views/pages/farm_designer.html.erb @@ -0,0 +1,3 @@ +