volt-user_templates 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0eaaeb969ed0696f54bb7050cb51ce7ff49897f7
-  data.tar.gz: 006cd8c8e3220f4b7f48b0b77d5a7c53a114b52d
+  metadata.gz: 62412eb3bb8518f0265635d4e9eb5be024d41a7c
+  data.tar.gz: 90f2ce74a486c78799acc24dc900a6bbd79e9374
 SHA512:
-  metadata.gz: 4511e46fd90c38d93946c54b767cfdb0a12b124635a649ce822abeda44d18205c69c3a4cdb56d2384852ce1092ccd23edbb7ea10d80084b9fd4403223ca17e9e
-  data.tar.gz: a814236105ff75a201acc49df0523b7b5ea7db88e1edf4cd1231e3069cb5cdc3fd06f355a2f55caedef0cedf02c16b786de10c23761139bc122fdbca2509e999
+  metadata.gz: 54015581a0c66f3b80afd0917a2815e691afeb2623747deb7f03953542488abf037a36b66e4283a0cb19fa4d69c3537b7255123c6220809201da3ebaa00cb2b5
+  data.tar.gz: 08917295aeff55475203165c7104b93003bf266835a9aa354c58037d24287262e5cd25247c0069189fdbdae7869ec2ca41dd414c44588475bf3556dd7cb7182b

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/app/user_templates/controllers/account_controller.rb

@@ -0,0 +1,16 @@
+module UserTemplates
+  class AccountController < Volt::ModelController
+    before_action :require_login
+
+    def index
+      self.model = Volt.fetch_current_user.then(&:buffer)
+    end
+
+    def save
+      model.save! do
+        flash._notices << 'Account settings saved'
+        redirect_to '/'
+      end
+    end
+  end
+end

data/app/user_templates/controllers/login_controller.rb

@@ -6,13 +6,13 @@ module UserTemplates
     reactive_accessor :reset_email
 
     def do_login
-      Volt.login(login, password).then do
+      Volt.login(login, password).then do |res|
         # Successful login, clear out the form
         self.errors = nil
         self.login = ''
         self.password = ''
 
-        redirect_to(attrs.post_login_url || '/')
+        after_login
 
         nil
       end.fail do |errors|
@@ -21,6 +21,10 @@ module UserTemplates
       end
     end
 
+    def after_login
+      redirect_to(attrs.post_login_url || '/')
+    end
+
     def forgot_url
       url_for(component: 'user_templates', controller: 'login', action: 'forgot')
     end

data/app/user_templates/controllers/signup_controller.rb

@@ -12,12 +12,9 @@ module UserTemplates
       save!.then do |result|
         flash._notices << "Signup successful"
 
-        post_signup_url = attrs.post_signup_url || '/'
-
         # On a successful signup, then login
         Volt.login(login, password).then do
-          # Redirect to post signup url
-          redirect_to post_signup_url
+          after_signup
         end.fail do |errors|
           # Show the error (probably only the server goes down)
           flash._errors << errors.to_s
@@ -27,6 +24,13 @@ module UserTemplates
       end
     end
 
+    def after_signup
+      post_signup_url = attrs.post_signup_url || '/'
+
+      # Redirect to post signup url
+      redirect_to post_signup_url
+    end
+
     def use_username?
       Volt.config.public.try(:auth).try(:use_username)
     end

data/app/user_templates/tasks/user_template_tasks.rb

@@ -1,10 +1,22 @@
+require 'digest'
+
 class UserTemplateTasks < Volt::Task
+  def password_reset_token(user_id)
+    Digest::SHA256.hexdigest("#{user_id}||#{Volt.config.app_secret}")
+  end
+
   def send_reset_email(email)
     # Find user by e-mail
     Volt.skip_permissions do
       store._users.where(email: email).fetch_first do |user|
         if user
-          Mailer.deliver('user_templates/mailers/forgot', {to: email, name: user._name})
+          reset_token = password_reset_token(user.id)
+
+          reset_url = "http://#{Volt.config.domain}/#{reset_token}"
+
+          Mailer.deliver('user_templates/mailers/forgot',
+            {to: email, name: user._name, reset_url: reset_url}
+          )
         else
           raise "There is no account with the e-mail of #{email}."
         end

data/app/user_templates/views/account/index.html

@@ -0,0 +1,26 @@
+<:Title>
+  Your Account
+
+<:Body>
+  <div class="row">
+    <div class="col-md-6 col-md-offset-3">
+      <div class="span4 offset4 well">
+        <legend>Basic Info</legend>
+
+        <form e-submit="save">
+          <:fields:text value="{{ _name }}" />
+          <:fields:textarea value="{{ _bio }}" />
+          <button class="btn btn-info btn-block">Save</button>
+        </form>
+
+      </div>
+      <hr />
+      <div class="span4 offset4 well">
+        <legend>Update Password</legend>
+        <form e-submit="save">
+          <:fields:text type="password" value="{{ _password }}" />
+          <button class="btn btn-info btn-block">Save</button>
+        </form>
+      </div>
+    </div>
+  </div>

data/app/user_templates/views/login/index.html

@@ -24,7 +24,7 @@
           </div>
 
           <div class="form-group">
-            <label class="control-label">Password <small style="font-weight: normal;">(<a href="{{ forgot_url }}">forgot password</a>)</small></label>
+            <label class="control-label">Password <small style="font-weight: normal;">(<a tabindex="-1" href="{{ forgot_url }}">forgot password</a>)</small></label>
             <input class="form-control" type="password" value="{{ password }}">
           </div>
 

data/app/user_templates/views/mailers/forgot.email

@@ -20,7 +20,7 @@
                       <h1 style="font-size: 20px; margin: 0; color: #333;"> Hello {{ name }}, </h1>
                       <p style="font: 15px/1.25em 'Helvetica Neue', Arial, Helvetica; color: #333;"> We heard you needed to reset your password. Click the button below and you'll be redirected to a page where you can reset your password.</p>
                       <p style="font: 15px/1.25em 'Helvetica Neue', Arial, Helvetica; margin-bottom: 0; text-align: center; color: #333;">
-                        <a href="" style="border-radius: 3px; -moz-border-radius: 3px; -webkit-border-radius: 3px; background: #5cb85c; color: #fff; cursor: pointer; display: block; font-weight: 700; font-size: 16px; line-height: 1.25em; margin: 24px auto 24px; padding: 10px 18px; text-decoration: none; width: 180px; text-align: center;"> Reset Password </a>
+                        <a href="{{ reset_url }}" style="border-radius: 3px; -moz-border-radius: 3px; -webkit-border-radius: 3px; background: #5cb85c; color: #fff; cursor: pointer; display: block; font-weight: 700; font-size: 16px; line-height: 1.25em; margin: 24px auto 24px; padding: 10px 18px; text-decoration: none; width: 180px; text-align: center;"> Reset Password </a>
                       </p>
                     </td>
                   </tr>
@@ -38,4 +38,4 @@ Hey {{ name }},
 
 We heard you needed to reset your password. Go to the following url to reset your password:
 
-http://www.someurl.com/
+{{ reset_url }}

data/volt-user_templates.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "volt-fields", "~> 0.1.0"
-  spec.add_dependency "volt-mailer", "~> 0.0.2"
+  spec.add_dependency "volt-mailer", "~> 0.1.0"
   spec.add_development_dependency "rake"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt-user_templates
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: volt-fields
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,10 +66,12 @@ files:
 - VERSION
 - app/user_templates/config/dependencies.rb
 - app/user_templates/config/routes.rb
+- app/user_templates/controllers/account_controller.rb
 - app/user_templates/controllers/login_controller.rb
 - app/user_templates/controllers/menu_controller.rb
 - app/user_templates/controllers/signup_controller.rb
 - app/user_templates/tasks/user_template_tasks.rb
+- app/user_templates/views/account/index.html
 - app/user_templates/views/login/forgot.html
 - app/user_templates/views/login/index.html
 - app/user_templates/views/mailers/forgot.email
@@ -97,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Volt user templates provide out of the box templates for users to signup,