diff --git a/Gemfile.lock b/Gemfile.lock index 1f72ed3..57a0b24 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,7 +40,7 @@ GEM binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) builder (3.2.3) - byebug (9.0.6) + byebug (9.1.0) cancancan (2.0.0) coffee-rails (4.1.1) coffee-script (>= 2.2.0) @@ -50,6 +50,7 @@ GEM execjs coffee-script-source (1.12.2) concurrent-ruby (1.0.5) + crass (1.0.2) debug_inspector (0.0.3) devise (4.3.0) bcrypt (~> 3.0) @@ -71,18 +72,19 @@ GEM railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (1.8.6) - loofah (2.0.3) + loofah (2.1.1) + crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.6.6) mime-types (>= 1.16, < 4) mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) - mini_portile2 (2.2.0) + mini_portile2 (2.3.0) minitest (5.10.3) - multi_json (1.12.1) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) + multi_json (1.12.2) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.0) orm_adapter (0.5.0) rack (1.6.8) rack-test (0.6.3) @@ -111,7 +113,7 @@ GEM activesupport (= 4.2.8) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.0.0) + rake (12.1.0) rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) @@ -119,7 +121,7 @@ GEM responders (2.4.0) actionpack (>= 4.2.0, < 5.3) railties (>= 4.2.0, < 5.3) - sass (3.5.1) + sass (3.5.2) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -138,14 +140,14 @@ GEM sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.0) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) - thor (0.19.4) + thor (0.20.0) thread_safe (0.3.6) - tilt (2.0.7) + tilt (2.0.8) turbolinks (5.0.1) turbolinks-source (~> 5) turbolinks-source (5.0.3) @@ -181,4 +183,4 @@ DEPENDENCIES web-console (~> 2.0) BUNDLED WITH - 1.15.1 + 1.15.4 diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb index 3d6d11a..f6f83e9 100644 --- a/app/views/devise/passwords/new.html.erb +++ b/app/views/devise/passwords/new.html.erb @@ -1,16 +1,407 @@ -

Forgot your password?

+ + + + + Forgot your password? -<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> - <%= devise_error_messages! %> + -
- <%= f.label :email %>
- <%= f.email_field :email, autofocus: true %> -
+ + + + + + <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> + +
+ + + +
+
+
+ Forgot your password? +
+
+ + +
+
+

Resending Success

+

Resset Now

+
+
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce semper laoreet placerat. Nullam semper auctor justo, rutrum posuere odio vulputate nec.

+
+
+
+ +

Resending...

+
+ + + + + + <% end %> + + + diff --git a/log/development.log b/log/development.log index 7123d17..e6a9a7a 100644 --- a/log/development.log +++ b/log/development.log @@ -3049,3 +3049,83 @@ Processing by CommentsController#create as JS Rendered answers/_comment.html.erb (2.1ms) Rendered comments/create.js.erb (4.4ms) Completed 200 OK in 576ms (Views: 12.8ms | ActiveRecord: 549.8ms) + ActiveRecord::SchemaMigration Load (0.1ms) SELECT "schema_migrations".* FROM "schema_migrations" + ActiveRecord::SchemaMigration Load (0.1ms) SELECT "schema_migrations".* FROM "schema_migrations" +  (0.2ms)  SELECT sql + FROM sqlite_master + WHERE name='index_answers_on_user_id' AND type='index' + UNION ALL + SELECT sql + FROM sqlite_temp_master + WHERE name='index_answers_on_user_id' AND type='index' + +  (0.1ms) SELECT sql + FROM sqlite_master + WHERE name='index_answers_on_question_id' AND type='index' + UNION ALL + SELECT sql + FROM sqlite_temp_master + WHERE name='index_answers_on_question_id' AND type='index' + +  (0.1ms)  SELECT sql + FROM sqlite_master + WHERE name='index_comments_on_answer_id' AND type='index' + UNION ALL + SELECT sql + FROM sqlite_temp_master + WHERE name='index_comments_on_answer_id' AND type='index' + +  (0.1ms) SELECT sql + FROM sqlite_master + WHERE name='index_comments_on_user_id' AND type='index' + UNION ALL + SELECT sql + FROM sqlite_temp_master + WHERE name='index_comments_on_user_id' AND type='index' + +  (0.1ms)  SELECT sql + FROM sqlite_master + WHERE name='index_questions_on_user_id' AND type='index' + UNION ALL + SELECT sql + FROM sqlite_temp_master + WHERE name='index_questions_on_user_id' AND type='index' + +  (0.1ms) SELECT sql + FROM sqlite_master + WHERE name='index_users_on_reset_password_token' AND type='index' + UNION ALL + SELECT sql + FROM sqlite_temp_master + WHERE name='index_users_on_reset_password_token' AND type='index' + +  (0.1ms)  SELECT sql + FROM sqlite_master + WHERE name='index_users_on_email' AND type='index' + UNION ALL + SELECT sql + FROM sqlite_temp_master + WHERE name='index_users_on_email' AND type='index' + + + +Started GET "/" for 127.0.0.1 at 2017-10-13 10:55:35 +0530 + ActiveRecord::SchemaMigration Load (0.1ms) SELECT "schema_migrations".* FROM "schema_migrations" +Processing by HomeController#index as HTML +Completed 401 Unauthorized in 46ms (ActiveRecord: 0.0ms) + + +Started GET "/users/sign_in" for 127.0.0.1 at 2017-10-13 10:55:36 +0530 +Processing by Devise::SessionsController#new as HTML + Rendered devise/shared/_links.html.erb (1.1ms) + Rendered devise/sessions/new.html.erb within layouts/application (33.9ms) +Completed 200 OK in 558ms (Views: 527.6ms | ActiveRecord: 0.5ms) + + +Started GET "/assets/scaffolds.self-2e087d9ddfcbc0f7251f8f42b567ea671f43468d12735884e44a2edf5ea37b74.css?body=1" for 127.0.0.1 at 2017-10-13 10:55:36 +0530 + + +Started GET "/users/password/new" for 127.0.0.1 at 2017-10-13 10:58:43 +0530 +Processing by Devise::PasswordsController#new as HTML + Rendered devise/passwords/new.html.erb within layouts/application (3.5ms) +Completed 200 OK in 30ms (Views: 28.7ms | ActiveRecord: 0.0ms) diff --git a/tmp/cache/assets/sprockets/v3.0/-R/-R7_RkcD6N6MGTSfYHPRVEcbi7JkjO4WVYiB7XXN9eI.cache b/tmp/cache/assets/sprockets/v3.0/-R/-R7_RkcD6N6MGTSfYHPRVEcbi7JkjO4WVYiB7XXN9eI.cache index a27f0b8..ea1f107 100644 Binary files a/tmp/cache/assets/sprockets/v3.0/-R/-R7_RkcD6N6MGTSfYHPRVEcbi7JkjO4WVYiB7XXN9eI.cache and b/tmp/cache/assets/sprockets/v3.0/-R/-R7_RkcD6N6MGTSfYHPRVEcbi7JkjO4WVYiB7XXN9eI.cache differ diff --git a/tmp/cache/assets/sprockets/v3.0/2l/2lmqrcmxCty2kCZ3cNJCAdDnuJ89JmKNOFFDlOcQzUs.cache b/tmp/cache/assets/sprockets/v3.0/2l/2lmqrcmxCty2kCZ3cNJCAdDnuJ89JmKNOFFDlOcQzUs.cache index 9832325..10d9b8a 100644 Binary files a/tmp/cache/assets/sprockets/v3.0/2l/2lmqrcmxCty2kCZ3cNJCAdDnuJ89JmKNOFFDlOcQzUs.cache and b/tmp/cache/assets/sprockets/v3.0/2l/2lmqrcmxCty2kCZ3cNJCAdDnuJ89JmKNOFFDlOcQzUs.cache differ diff --git a/tmp/cache/assets/sprockets/v3.0/5L/5Lly_CA8DZvPhQV2jDQx-Y6P_y3Ygra9t5jfSlGhHDA.cache b/tmp/cache/assets/sprockets/v3.0/5L/5Lly_CA8DZvPhQV2jDQx-Y6P_y3Ygra9t5jfSlGhHDA.cache index cafc9b7..d99de66 100644 Binary files a/tmp/cache/assets/sprockets/v3.0/5L/5Lly_CA8DZvPhQV2jDQx-Y6P_y3Ygra9t5jfSlGhHDA.cache and b/tmp/cache/assets/sprockets/v3.0/5L/5Lly_CA8DZvPhQV2jDQx-Y6P_y3Ygra9t5jfSlGhHDA.cache differ diff --git a/tmp/cache/assets/sprockets/v3.0/AP/APY89OAPJx9A3D3xcCoktvEvQUs7NcWChYXnjjjPzz0.cache b/tmp/cache/assets/sprockets/v3.0/AP/APY89OAPJx9A3D3xcCoktvEvQUs7NcWChYXnjjjPzz0.cache index 42c1724..5f31095 100644 Binary files a/tmp/cache/assets/sprockets/v3.0/AP/APY89OAPJx9A3D3xcCoktvEvQUs7NcWChYXnjjjPzz0.cache and b/tmp/cache/assets/sprockets/v3.0/AP/APY89OAPJx9A3D3xcCoktvEvQUs7NcWChYXnjjjPzz0.cache differ diff --git a/tmp/cache/assets/sprockets/v3.0/DS/DSOLSc6A5RVSmvM415eEWAWG_AgOvZcLZOXQjsXyWQA.cache b/tmp/cache/assets/sprockets/v3.0/DS/DSOLSc6A5RVSmvM415eEWAWG_AgOvZcLZOXQjsXyWQA.cache index 20e0bf0..7d40e25 100644 Binary files a/tmp/cache/assets/sprockets/v3.0/DS/DSOLSc6A5RVSmvM415eEWAWG_AgOvZcLZOXQjsXyWQA.cache and b/tmp/cache/assets/sprockets/v3.0/DS/DSOLSc6A5RVSmvM415eEWAWG_AgOvZcLZOXQjsXyWQA.cache differ diff --git a/tmp/cache/assets/sprockets/v3.0/EB/EBtbhweQl74JQNkwFL3ahZH_9x44ceqa9hOT8lQ_SfM.cache b/tmp/cache/assets/sprockets/v3.0/EB/EBtbhweQl74JQNkwFL3ahZH_9x44ceqa9hOT8lQ_SfM.cache index 8ed6a3a..1a95c79 100644 Binary files a/tmp/cache/assets/sprockets/v3.0/EB/EBtbhweQl74JQNkwFL3ahZH_9x44ceqa9hOT8lQ_SfM.cache and b/tmp/cache/assets/sprockets/v3.0/EB/EBtbhweQl74JQNkwFL3ahZH_9x44ceqa9hOT8lQ_SfM.cache differ diff --git a/tmp/cache/assets/sprockets/v3.0/OI/OI6uxGcnsKavdWTtwDAasU3wPx8QXhzBgV0X2n1KjMQ.cache b/tmp/cache/assets/sprockets/v3.0/OI/OI6uxGcnsKavdWTtwDAasU3wPx8QXhzBgV0X2n1KjMQ.cache index 9c28a73..db5146d 100644 Binary files a/tmp/cache/assets/sprockets/v3.0/OI/OI6uxGcnsKavdWTtwDAasU3wPx8QXhzBgV0X2n1KjMQ.cache and b/tmp/cache/assets/sprockets/v3.0/OI/OI6uxGcnsKavdWTtwDAasU3wPx8QXhzBgV0X2n1KjMQ.cache differ diff --git a/tmp/cache/assets/sprockets/v3.0/Pm/Pm3ENYpCrQMOJGd-d8lACN_nbGZWiivq_KyPLJoD9Xk.cache b/tmp/cache/assets/sprockets/v3.0/Pm/Pm3ENYpCrQMOJGd-d8lACN_nbGZWiivq_KyPLJoD9Xk.cache index 19e3e34..b39ee88 100644 Binary files a/tmp/cache/assets/sprockets/v3.0/Pm/Pm3ENYpCrQMOJGd-d8lACN_nbGZWiivq_KyPLJoD9Xk.cache and b/tmp/cache/assets/sprockets/v3.0/Pm/Pm3ENYpCrQMOJGd-d8lACN_nbGZWiivq_KyPLJoD9Xk.cache differ diff --git a/tmp/cache/assets/sprockets/v3.0/cB/cBHNTIidI3nLps4kbXN2sq8Eyq4Z44TbhbXVVGTcDw8.cache b/tmp/cache/assets/sprockets/v3.0/cB/cBHNTIidI3nLps4kbXN2sq8Eyq4Z44TbhbXVVGTcDw8.cache index 2ebd0d8..c7f67f9 100644 Binary files a/tmp/cache/assets/sprockets/v3.0/cB/cBHNTIidI3nLps4kbXN2sq8Eyq4Z44TbhbXVVGTcDw8.cache and b/tmp/cache/assets/sprockets/v3.0/cB/cBHNTIidI3nLps4kbXN2sq8Eyq4Z44TbhbXVVGTcDw8.cache differ diff --git a/tmp/cache/assets/sprockets/v3.0/iB/iBpppPyf6kSbE22DKeoOOPi8lqsSBnIhloSGpRo-ExE.cache b/tmp/cache/assets/sprockets/v3.0/iB/iBpppPyf6kSbE22DKeoOOPi8lqsSBnIhloSGpRo-ExE.cache index 96bfc71..c41745d 100644 Binary files a/tmp/cache/assets/sprockets/v3.0/iB/iBpppPyf6kSbE22DKeoOOPi8lqsSBnIhloSGpRo-ExE.cache and b/tmp/cache/assets/sprockets/v3.0/iB/iBpppPyf6kSbE22DKeoOOPi8lqsSBnIhloSGpRo-ExE.cache differ diff --git a/tmp/cache/assets/sprockets/v3.0/iG/iGJ0ukbPfqOjxgOTH8VrlcE_ugJGXqrHta1xM9piuDg.cache b/tmp/cache/assets/sprockets/v3.0/iG/iGJ0ukbPfqOjxgOTH8VrlcE_ugJGXqrHta1xM9piuDg.cache index 0dff719..d5ad159 100644 Binary files a/tmp/cache/assets/sprockets/v3.0/iG/iGJ0ukbPfqOjxgOTH8VrlcE_ugJGXqrHta1xM9piuDg.cache and b/tmp/cache/assets/sprockets/v3.0/iG/iGJ0ukbPfqOjxgOTH8VrlcE_ugJGXqrHta1xM9piuDg.cache differ diff --git a/tmp/cache/assets/sprockets/v3.0/k2/k2U8BbNQaVW-TO7TrImnoS7YaV2yYstDiU6cY4poHnk.cache b/tmp/cache/assets/sprockets/v3.0/k2/k2U8BbNQaVW-TO7TrImnoS7YaV2yYstDiU6cY4poHnk.cache index 43d9d4f..366a9a4 100644 Binary files a/tmp/cache/assets/sprockets/v3.0/k2/k2U8BbNQaVW-TO7TrImnoS7YaV2yYstDiU6cY4poHnk.cache and b/tmp/cache/assets/sprockets/v3.0/k2/k2U8BbNQaVW-TO7TrImnoS7YaV2yYstDiU6cY4poHnk.cache differ diff --git a/tmp/cache/assets/sprockets/v3.0/kS/kSkCWaAJCcTgZ_AhrRCjZhNtkE12cubiq70uNtditqk.cache b/tmp/cache/assets/sprockets/v3.0/kS/kSkCWaAJCcTgZ_AhrRCjZhNtkE12cubiq70uNtditqk.cache index 3b2dd44..d59224a 100644 Binary files a/tmp/cache/assets/sprockets/v3.0/kS/kSkCWaAJCcTgZ_AhrRCjZhNtkE12cubiq70uNtditqk.cache and b/tmp/cache/assets/sprockets/v3.0/kS/kSkCWaAJCcTgZ_AhrRCjZhNtkE12cubiq70uNtditqk.cache differ