diff --git a/Gemfile b/Gemfile
index 83462c2..c7bc863 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,6 +5,7 @@ gem 'bcrypt', '~> 3.1.7'
gem 'mysql2', '>= 0.3.18', '< 0.5'
gem 'rails', '~> 5.0', '>= 5.0.0.1'
+gem 'font-awesome-rails'
gem 'jbuilder', '~> 2.6'
gem 'jquery-rails'
gem 'json', '~> 2.0.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 0121224..f860fd6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -60,6 +60,8 @@ GEM
ffi (1.9.14)
figaro (1.1.1)
thor (~> 0.14)
+ font-awesome-rails (4.6.3.0)
+ railties (>= 3.2, < 5.1)
formatador (0.2.5)
globalid (0.3.7)
activesupport (>= 4.1.0)
@@ -237,6 +239,7 @@ DEPENDENCIES
binding_of_caller
byebug
figaro (~> 1.1.1)
+ font-awesome-rails
guard
guard-livereload
guard-minitest
@@ -264,4 +267,4 @@ DEPENDENCIES
web-console
BUNDLED WITH
- 1.12.5
+ 1.13.0
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index b12018d..8ab7d9a 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -13,4 +13,4 @@
//= require jquery
//= require jquery_ujs
//= require turbolinks
-//= require_tree .
+//= require main
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
new file mode 100644
index 0000000..75d694f
--- /dev/null
+++ b/app/assets/javascripts/main.js
@@ -0,0 +1,30 @@
+function getPassword($container, password) {
+ $container.data('password', password);
+ $container.find('span').html(password);
+ $container.find('a').detach();
+ $container.prepend('');
+}
+
+function hidePassword($src){
+ $src.siblings('span').html('********');
+ $src.removeClass('fa-unlock').addClass('fa-lock');
+}
+
+function revealPassword($src){
+ $src.siblings('span').html($src.parent().data('password'));
+ $src.removeClass('fa-lock').addClass('fa-unlock');
+}
+
+$(function(){
+ $("[data-id=passwd]").on("ajax:success", "a", function(e, data){
+ getPassword($(e.target).parent(), data.hash);
+ });
+
+ $("[data-id=passwd]").on('click', 'i', function(){
+ if($(this).hasClass('fa-unlock')){
+ hidePassword($(this));
+ } else {
+ revealPassword($(this));
+ }
+ });
+});
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 0ebd7fe..6807ffb 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -10,6 +10,34 @@
* files in this directory. Styles in this file should be added after the last require_* statement.
* It is generally better to create a new file per style scope.
*
+ *= require font-awesome
*= require_tree .
*= require_self
*/
+
+table {
+ width: 100%;
+}
+
+th {
+ text-align: left;
+}
+
+td {
+ padding: 5px 0;
+}
+
+.field {
+ margin: 5px 0;
+}
+
+td.passwd {
+ width: 20em;
+}
+
+.passwd a,
+.passwd i {
+ color: #000;
+ cursor: pointer;
+ text-decoration: none;
+}
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index cd54e4e..bd9858f 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -1,5 +1,5 @@
class AccountsController < ApplicationController
- before_action :set_account, only: [:show, :edit, :update, :destroy]
+ before_action :set_account, only: [:show, :edit, :reveal, :update, :destroy]
# GET /accounts
# GET /accounts.json
@@ -21,6 +21,10 @@ class AccountsController < ApplicationController
def edit
end
+ def reveal
+ render json: { hash: @account.password }.to_json
+ end
+
# POST /accounts
# POST /accounts.json
def create
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index 10a4cba..141a300 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -1,3 +1,7 @@
class ApplicationRecord < ActiveRecord::Base
self.abstract_class = true
+
+ def to_i
+ id
+ end
end
diff --git a/app/views/accounts/index.html.erb b/app/views/accounts/index.html.erb
index f82fe5a..0765a56 100644
--- a/app/views/accounts/index.html.erb
+++ b/app/views/accounts/index.html.erb
@@ -7,8 +7,8 @@
| Username |
Password |
- Home |
Site |
+ Home |
|
@@ -17,12 +17,16 @@
<% @accounts.each do |account| %>
| <%= account.username %> |
- <%= account.password %> |
- <%= account.home %> |
+
+ <%= link_to reveal_password_path(account.id), remote: true do %>
+
+ <% end %>
+ ********
+ |
<%= account.site %> |
+ <%= account.home %> |
<%= link_to 'Show', account %> |
<%= link_to 'Edit', edit_account_path(account) %> |
- <%= link_to 'Destroy', account, method: :delete, data: { confirm: 'Are you sure?' } %> |
<% end %>
diff --git a/app/views/accounts/show.html.erb b/app/views/accounts/show.html.erb
index ee610a4..4583084 100644
--- a/app/views/accounts/show.html.erb
+++ b/app/views/accounts/show.html.erb
@@ -7,7 +7,12 @@
Password:
- <%= @account.password %>
+
+ <%= link_to reveal_password_path(@account.id), remote: true do %>
+
+ <% end %>
+ ********
+
@@ -20,5 +25,6 @@
<%= @account.site %>
+<%= link_to 'Destroy', @account, method: :delete, data: { confirm: 'Are you sure?' } %>
<%= link_to 'Edit', edit_account_path(@account) %> |
<%= link_to 'Back', accounts_path %>
diff --git a/config/routes.rb b/config/routes.rb
index 23147f1..16857e9 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,6 @@
Rails.application.routes.draw do
resources :accounts
+ get 'accounts/reveal/:id', to: 'accounts#reveal', as: :reveal_password
+
# For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
end
diff --git a/test/controllers/accounts_controller_test.rb b/test/controllers/accounts_controller_test.rb
index 2a056f7..1fedc48 100644
--- a/test/controllers/accounts_controller_test.rb
+++ b/test/controllers/accounts_controller_test.rb
@@ -55,4 +55,12 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
assert_redirected_to accounts_url
end
+
+ test 'reveal should provide password' do
+ get reveal_password_url(@account.to_i), xhr: true
+ json = JSON.parse(response.body).to_hash
+
+ assert_response :success
+ assert_match '1q2w3e4r5t6y7u', json['hash']
+ end
end