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

Merge pull request #29 from rickcarlino/master 

Merging in Ghislaine's Work
pull/33/head
Rick Carlino 2014-04-06 11:53:16 -07:00
parent 2f78a43de7 40700a3406
commit fdf29b4632
3 changed files with 212 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -11,7 +11,7 @@ spec/reports
test/tmp
test/version_tmp
tmp
log/
# YARD artifacts
.yardoc
_yardoc

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

@ -1,2 +1,90 @@
<h1> Hello, world! </h1>
<p>The time is now <strong><%= Time.now %></strong></p>
<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">
<h4>Farmbot</h4>
<!-- accordion-->
<dl class="accordion" data-accordion>
<dd>
<a href="#panel1">Genesis Tracks</a>
<div id="panel1" class="content active">
<ul>
<li>Model: Genesis Tracks</li>
<li>Lenght</li>
<li>Width</li>
<li>Height</li>
<li>Installation Date</li>
</ul>
</div>
</dd>
<dd>
<a href="#panel2">Genesis Gantry</a>
<div id="panel2" class="content">
</div>
</dd>
<dd>
<a href="#panel3">Richmond Cross-Slide</a>
<div id="panel3" class="content">
</div>
</dd>
<dd>
<a href="#panel3">Custom Tool Mount</a>
<div id="panel3" class="content">
</div>
</dd>
</dl>
<!-- /accordion-->
<h4>Tools</h4>
<h4>Sensors</h4>
</div>
<div class="large-6 columns">
<h4>Resource Usage</h4>
</div>
</div>
<div class="row">
<div class="large-6 columns">
<h4>System Information</h4>
<h4>Manual Control</h4>
</div>
<div class="large-6 columns">
<h4>Finances</h4>
</div>
</div>

121
log/development.log
View File

@ -89,3 +89,124 @@ Started GET "/assets/turbolinks.js?body=1" for 127.0.0.1 at 2014-03-31 06:28:36
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)