spacecruft
/
Farmbot-Web-App
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge pull request #31 from rickcarlino/master 

Updates for 10 APR 14
pull/37/head
Rick Carlino 2014-04-10 06:34:01 -07:00
parent 382f933745 7176ca1ce7
commit a99e77ef23
7 changed files with 68 additions and 346 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
.gitignore vendored
View File

@ -11,8 +11,34 @@ spec/reports
test/tmp
test/version_tmp
tmp
log/
log/*.log
# YARD artifacts
.yardoc
_yardoc
doc/
*.rbc
capybara-*.html
.rspec
/log
/tmp
/db/*.sqlite3
/public/system
/coverage/
/spec/tmp
**.orig
rerun.txt
pickle-email-*.html
# TODO Comment out this rules if you are OK with secrets been uploaded to the repo
config/initializers/secret_token.rb
config/secrets.yml
## Environment normalisation:
/.bundle
/vendor/bundle
# these should all be checked in to normalise the environment:
# Gemfile.lock, .ruby-version, .ruby-gemset
# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
.rvmrc

4
README.md
View File

@ -9,6 +9,8 @@ This Repo is the Web based side of the decision support system. It is the glue t
1. `git clone git@github.com:FarmBot/farmbot-web-backend.git`
2. `cd farmbot-web-backend`
3. [Install MongoDB](http://docs.mongodb.org/manual/tutorial/install-mongodb-on-os-x/)
4. Start Mongo if you have not already done so. (typically via the `mongod` command)
3. `bundle install`
4. `rails s`
5. Checkout `http://localhost:3000`
@ -20,7 +22,7 @@ This Repo is the Web based side of the decision support system. It is the glue t
# Roadmap
This project is still in its infancy. Our current focus as of March 2014 is to create a basic system of control for the farmbot user via technologies such as:
This project is still in its infancy. Our current focus as of April 2014 is to create a basic system of control for the farmbot user via technologies such as:
* [Farmbot Controller](https://github.com/FarmBot/farmbot-raspberry-pi-controller)
* [Skynet IoT Messaging Platform](http://www.skynet.im) ([Github](https://github.com/skynetim/skynet))

6
app/models/user.rb
View File

@ -30,7 +30,9 @@ class User
# field :unconfirmed_email, type: String # Only if using reconfirmable
## Lockable
# field :failed_attempts, type: Integer, default: 0 # Only if lock strategy is :failed_attempts
# field :unlock_token, type: String # Only if unlock strategy is :email or :both
# field :failed_attempts, type: Integer, default: 0
# Only if lock strategy is :failed_attempts
# field :unlock_token, type: String
# Only if unlock strategy is :email or :both
# field :locked_at, type: Time
end

30
app/views/layouts/application.html.erb
View File

@ -13,6 +13,36 @@
<body>
<!-- TODO: Style the alert dialogs -->
<nav class="top-bar" data-topbar>
<ul class="title-area">
<li class="name">
<h1><a href="#">Farmbot</a></h1>
</li>
<li class="toggle-topbar menu-icon"><a href="#">Menu</a></li>
</ul>
<section class="top-bar-section">
<!-- Right Nav Section -->
<ul class="right">
<li class="has-dropdown">
<a href="#">Welcome, Rory!</a>
<ul class="dropdown">
<li><a href="#">Account Settings</a></li>
</ul>
</li>
<li><a href="#">Logout</a></li>
</ul>
<!-- Left Nav Section -->
<ul class="left">
<li class="active"><a href="#">Dashboard</a></li>
<li><a href="#">Farm</a></li>
<li><a href="#">Data</a></li>
<li><a href="#">Help</a></li>
</ul>
</section>
</nav>
<p class="notice"><%= notice %></p>
<p class="alert"><%= alert %></p>
<%= yield %>

4
app/views/pages/sitemap.html.erb 100644
View File

@ -0,0 +1,4 @@
<ul>
<li><%= link_to 'New User', new_user_registration_path %></li>
<li><%= link_to 'Edit Settings', edit_user_registration_path %></li>
</ul>

29
app/views/pages/welcome.html.erb
View File

@ -1,32 +1,3 @@
<nav class="top-bar" data-topbar>
<ul class="title-area">
<li class="name">
<h1><a href="#">Farmbot</a></h1>
</li>
<li class="toggle-topbar menu-icon"><a href="#">Menu</a></li>
</ul>
<section class="top-bar-section">
<!-- Right Nav Section -->
<ul class="right">
<li class="has-dropdown">
<a href="#">Welcome, Rory!</a>
<ul class="dropdown">
<li><a href="#">Account Settings</a></li>
</ul>
</li>
<li><a href="#">Logout</a></li>
</ul>
<!-- Left Nav Section -->
<ul class="left">
<li class="active"><a href="#">Dashboard</a></li>
<li><a href="#">Farm</a></li>
<li><a href="#">Data</a></li>
<li><a href="#">Help</a></li>
</ul>
</section>
</nav>
<div class="row">
<div class="large-6 columns">

313
log/development.log
View File

@ -1,313 +0,0 @@
Started GET "/" for 127.0.0.1 at 2014-03-12 06:39:28 -0700
Processing by Rails::WelcomeController#index as HTML
Rendered /Users/ricardocarlino/.rvm/rubies/ruby-2.1.1/lib/ruby/gems/2.1.0/gems/railties-4.0.3/lib/rails/templates/rails/welcome/index.html.erb (2.2ms)
Completed 200 OK in 57ms (Views: 30.8ms)
Started GET "/rails/info/properties" for 127.0.0.1 at 2014-03-12 06:39:40 -0700
Processing by Rails::InfoController#properties as */*
Rendered /Users/ricardocarlino/.rvm/rubies/ruby-2.1.1/lib/ruby/gems/2.1.0/gems/railties-4.0.3/lib/rails/templates/rails/info/properties.html.erb (0.5ms)
Completed 200 OK in 30ms (Views: 22.0ms)
Started GET "/" for 127.0.0.1 at 2014-03-31 06:28:31 -0700
Processing by HighVoltage::PagesController#show as HTML
Parameters: {"id"=>"welcome"}
Rendered pages/welcome.html.erb within layouts/application (2.1ms)
Completed 200 OK in 4195ms (Views: 4182.8ms)
Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2014-03-31 06:28:36 -0700
Started GET "/assets/foundation_and_overrides.css?body=1" for 127.0.0.1 at 2014-03-31 06:28:36 -0700
Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2014-03-31 06:28:36 -0700
Started GET "/assets/vendor/modernizr.js?body=1" for 127.0.0.1 at 2014-03-31 06:28:36 -0700
Started GET "/assets/foundation/foundation.js?body=1" for 127.0.0.1 at 2014-03-31 06:28:36 -0700
Started GET "/assets/jquery_ujs.js?body=1" for 127.0.0.1 at 2014-03-31 06:28:36 -0700
Started GET "/assets/foundation/foundation.abide.js?body=1" for 127.0.0.1 at 2014-03-31 06:28:36 -0700
Started GET "/assets/foundation/foundation.accordion.js?body=1" for 127.0.0.1 at 2014-03-31 06:28:36 -0700
Started GET "/assets/foundation/foundation.alert.js?body=1" for 127.0.0.1 at 2014-03-31 06:28:36 -0700
Started GET "/assets/foundation/foundation.clearing.js?body=1" for 127.0.0.1 at 2014-03-31 06:28:36 -0700
Started GET "/assets/foundation/foundation.dropdown.js?body=1" for 127.0.0.1 at 2014-03-31 06:28:36 -0700
Started GET "/assets/foundation/foundation.interchange.js?body=1" for 127.0.0.1 at 2014-03-31 06:28:36 -0700
Started GET "/assets/foundation/foundation.joyride.js?body=1" for 127.0.0.1 at 2014-03-31 06:28:36 -0700
Started GET "/assets/foundation/foundation.magellan.js?body=1" for 127.0.0.1 at 2014-03-31 06:28:36 -0700
Started GET "/assets/foundation/foundation.offcanvas.js?body=1" for 127.0.0.1 at 2014-03-31 06:28:36 -0700
Started GET "/assets/foundation/foundation.orbit.js?body=1" for 127.0.0.1 at 2014-03-31 06:28:36 -0700
Started GET "/assets/foundation/foundation.reveal.js?body=1" for 127.0.0.1 at 2014-03-31 06:28:36 -0700
Started GET "/assets/foundation/foundation.tab.js?body=1" for 127.0.0.1 at 2014-03-31 06:28:36 -0700
Started GET "/assets/foundation/foundation.tooltip.js?body=1" for 127.0.0.1 at 2014-03-31 06:28:36 -0700
Started GET "/assets/foundation/foundation.topbar.js?body=1" for 127.0.0.1 at 2014-03-31 06:28:36 -0700
Started GET "/assets/foundation/foundation.equalizer.js?body=1" for 127.0.0.1 at 2014-03-31 06:28:36 -0700
Started GET "/assets/foundation.js?body=1" for 127.0.0.1 at 2014-03-31 06:28:36 -0700
Started GET "/assets/turbolinks.js?body=1" for 127.0.0.1 at 2014-03-31 06:28:36 -0700
Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2014-03-31 06:28:36 -0700
Started GET "/" for 127.0.0.1 at 2014-04-06 11:34:10 -0700
Processing by HighVoltage::PagesController#show as HTML
Parameters: {"id"=>"welcome"}
Rendered pages/welcome.html.erb within layouts/application (3.6ms)
Completed 200 OK in 572ms (Views: 549.7ms)
Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700
Started GET "/assets/foundation_and_overrides.css?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700
Started GET "/assets/vendor/modernizr.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700
Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700
Started GET "/assets/foundation/foundation.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700
Started GET "/assets/jquery_ujs.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700
Started GET "/assets/foundation/foundation.abide.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700
Started GET "/assets/foundation/foundation.accordion.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700
Started GET "/assets/foundation/foundation.clearing.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700
Started GET "/assets/foundation/foundation.interchange.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700
Started GET "/assets/foundation/foundation.dropdown.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700
Started GET "/assets/foundation/foundation.alert.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700
Started GET "/assets/foundation/foundation.joyride.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700
Started GET "/assets/foundation/foundation.orbit.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700
Started GET "/assets/foundation/foundation.magellan.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700
Started GET "/assets/foundation/foundation.offcanvas.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700
Started GET "/assets/foundation/foundation.tab.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700
Started GET "/assets/foundation/foundation.reveal.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700
Started GET "/assets/foundation/foundation.tooltip.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700
Started GET "/assets/foundation/foundation.topbar.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700
Started GET "/assets/foundation/foundation.equalizer.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700
Started GET "/assets/foundation.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700
Started GET "/assets/turbolinks.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700
Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700
Started GET "/" for 127.0.0.1 at 2014-04-06 11:34:17 -0700
Processing by HighVoltage::PagesController#show as HTML
Parameters: {"id"=>"welcome"}
Rendered pages/welcome.html.erb within layouts/application (0.4ms)
Completed 200 OK in 10ms (Views: 9.2ms)
Started GET "/" for 127.0.0.1 at 2014-04-06 11:34:18 -0700
Processing by HighVoltage::PagesController#show as HTML
Parameters: {"id"=>"welcome"}
Rendered pages/welcome.html.erb within layouts/application (0.0ms)
Completed 200 OK in 9ms (Views: 8.4ms)
Started GET "/" for 127.0.0.1 at 2014-04-06 11:34:21 -0700
Processing by HighVoltage::PagesController#show as HTML
Parameters: {"id"=>"welcome"}
Rendered pages/welcome.html.erb within layouts/application (0.1ms)
Completed 200 OK in 11ms (Views: 10.0ms)
Started GET "/" for 127.0.0.1 at 2014-04-06 11:34:35 -0700
Processing by HighVoltage::PagesController#show as HTML
Parameters: {"id"=>"welcome"}
Rendered pages/welcome.html.erb within layouts/application (0.0ms)
Completed 200 OK in 9ms (Views: 8.7ms)
Started GET "/" for 127.0.0.1 at 2014-04-06 11:34:41 -0700
Processing by HighVoltage::PagesController#show as HTML
Parameters: {"id"=>"welcome"}
Rendered pages/welcome.html.erb within layouts/application (0.1ms)
Completed 200 OK in 14ms (Views: 13.0ms)
Started GET "/" for 127.0.0.1 at 2014-04-06 11:35:04 -0700
Processing by HighVoltage::PagesController#show as HTML
Parameters: {"id"=>"welcome"}
Rendered pages/welcome.html.erb within layouts/application (0.0ms)
Completed 200 OK in 9ms (Views: 8.5ms)
Started GET "/" for 127.0.0.1 at 2014-04-09 06:46:08 -0700
Processing by HighVoltage::PagesController#show as HTML
Parameters: {"id"=>"welcome"}
Rendered pages/welcome.html.erb within layouts/application (1.2ms)
Completed 500 Internal Server Error in 166ms
ActionView::Template::Error (couldn't find file 'turbolinks'
(in /Users/ricardocarlino/coding/farmbot-dss/app/assets/javascripts/application.js:16)):
16: <p class="notice"><%= notice %></p>
17: <p class="alert"><%= alert %></p>
18: <%= yield %>
19: <%= javascript_include_tag "application" %>
20: </body>
21: </html>
app/views/layouts/application.html.erb:19:in `_app_views_layouts_application_html_erb___2086124100225648697_70187935560720'
Rendered /Users/ricardocarlino/.rvm/gems/ruby-2.1.1@farmbot-dss/gems/actionpack-4.1.0/lib/action_dispatch/middleware/templates/rescues/_trace.html.erb (1.3ms)
Rendered /Users/ricardocarlino/.rvm/gems/ruby-2.1.1@farmbot-dss/gems/actionpack-4.1.0/lib/action_dispatch/middleware/templates/rescues/_request_and_response.html.erb (1.0ms)
Rendered /Users/ricardocarlino/.rvm/gems/ruby-2.1.1@farmbot-dss/gems/actionpack-4.1.0/lib/action_dispatch/middleware/templates/rescues/template_error.html.erb within rescues/layout (14.3ms)
Started GET "/" for 127.0.0.1 at 2014-04-09 06:46:48 -0700
Processing by HighVoltage::PagesController#show as HTML
Parameters: {"id"=>"welcome"}
Rendered pages/welcome.html.erb within layouts/application (0.1ms)
Completed 200 OK in 190ms (Views: 189.9ms)
Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2014-04-09 06:46:48 -0700
Started GET "/assets/foundation_and_overrides.css?body=1" for 127.0.0.1 at 2014-04-09 06:46:48 -0700
Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2014-04-09 06:46:48 -0700
Started GET "/assets/vendor/modernizr.js?body=1" for 127.0.0.1 at 2014-04-09 06:46:48 -0700
Started GET "/assets/jquery_ujs.js?body=1" for 127.0.0.1 at 2014-04-09 06:46:48 -0700
Started GET "/assets/foundation/foundation.js?body=1" for 127.0.0.1 at 2014-04-09 06:46:48 -0700
Started GET "/assets/foundation/foundation.abide.js?body=1" for 127.0.0.1 at 2014-04-09 06:46:48 -0700
Started GET "/assets/foundation/foundation.accordion.js?body=1" for 127.0.0.1 at 2014-04-09 06:46:48 -0700
Started GET "/assets/foundation/foundation.alert.js?body=1" for 127.0.0.1 at 2014-04-09 06:46:48 -0700
Started GET "/assets/foundation/foundation.clearing.js?body=1" for 127.0.0.1 at 2014-04-09 06:46:48 -0700
Started GET "/assets/foundation/foundation.dropdown.js?body=1" for 127.0.0.1 at 2014-04-09 06:46:48 -0700
Started GET "/assets/foundation/foundation.reveal.js?body=1" for 127.0.0.1 at 2014-04-09 06:46:48 -0700
Started GET "/assets/foundation/foundation.orbit.js?body=1" for 127.0.0.1 at 2014-04-09 06:46:48 -0700
Started GET "/assets/foundation/foundation.offcanvas.js?body=1" for 127.0.0.1 at 2014-04-09 06:46:48 -0700
Started GET "/assets/foundation/foundation.interchange.js?body=1" for 127.0.0.1 at 2014-04-09 06:46:48 -0700
Started GET "/assets/foundation/foundation.magellan.js?body=1" for 127.0.0.1 at 2014-04-09 06:46:48 -0700
Started GET "/assets/foundation/foundation.joyride.js?body=1" for 127.0.0.1 at 2014-04-09 06:46:48 -0700
Started GET "/assets/foundation/foundation.slider.js?body=1" for 127.0.0.1 at 2014-04-09 06:46:48 -0700
Started GET "/assets/foundation/foundation.tab.js?body=1" for 127.0.0.1 at 2014-04-09 06:46:48 -0700
Started GET "/assets/foundation/foundation.tooltip.js?body=1" for 127.0.0.1 at 2014-04-09 06:46:48 -0700
Started GET "/assets/foundation/foundation.topbar.js?body=1" for 127.0.0.1 at 2014-04-09 06:46:48 -0700
Started GET "/assets/foundation/foundation.equalizer.js?body=1" for 127.0.0.1 at 2014-04-09 06:46:49 -0700
Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2014-04-09 06:46:49 -0700
Started GET "/assets/foundation.js?body=1" for 127.0.0.1 at 2014-04-09 06:46:49 -0700