Finished devise work, need landing page with user actions

pull/31/head
rick carlino 2014-04-10 06:27:53 -07:00
parent 14718652b8
commit cd045ed779
6 changed files with 1257 additions and 32 deletions

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))

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

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 %>

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>

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">

File diff suppressed because it is too large Load Diff