From 0f1e0ef3f97a2e9990b1793150360d53a14c8624 Mon Sep 17 00:00:00 2001 From: Andreas N Date: Fri, 19 Dec 2014 21:49:48 +0100 Subject: [PATCH 01/53] fixed missing profile-header --- app/views/user/show_follow.html.haml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/user/show_follow.html.haml b/app/views/user/show_follow.html.haml index a93a0f61..6550f6d1 100644 --- a/app/views/user/show_follow.html.haml +++ b/app/views/user/show_follow.html.haml @@ -1,3 +1,4 @@ +.profile--header .container.j2-page .col-md-3.col-xs-12.col-sm-3 = render 'user/profile_info' From e483714f44a398e39a656d960dbbdff78f72a0af Mon Sep 17 00:00:00 2001 From: Andreas N Date: Fri, 19 Dec 2014 22:11:49 +0100 Subject: [PATCH 02/53] fix headings --- app/assets/stylesheets/base.css.scss | 4 ++++ app/views/user/show_follow.html.haml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/base.css.scss b/app/assets/stylesheets/base.css.scss index c2f74b76..8bb46eb2 100644 --- a/app/assets/stylesheets/base.css.scss +++ b/app/assets/stylesheets/base.css.scss @@ -53,4 +53,8 @@ body { .smiles { margin-bottom: 7px; +} + +.j2-lh { + color: #fff; } \ No newline at end of file diff --git a/app/views/user/show_follow.html.haml b/app/views/user/show_follow.html.haml index 6550f6d1..89e428de 100644 --- a/app/views/user/show_follow.html.haml +++ b/app/views/user/show_follow.html.haml @@ -4,7 +4,7 @@ = render 'user/profile_info' .hidden-xs= render 'shared/links' .col-md-9.col-xs-12.col-sm-9 - %h1= @title + %h1.j2-lh= @title #users - @users.each do |user| .col-sm-6 From 46c9ccc0ac466057e835974de9761577379eb3de Mon Sep 17 00:00:00 2001 From: Andreas N Date: Fri, 19 Dec 2014 22:34:24 +0100 Subject: [PATCH 03/53] question page added --- app/controllers/user_controller.rb | 6 ++++++ app/views/user/questions.html.haml | 17 +++++++++++++++++ app/views/user/questions.js.erb | 8 ++++++++ config/routes.rb | 1 + 4 files changed, 32 insertions(+) create mode 100644 app/views/user/questions.html.haml create mode 100644 app/views/user/questions.js.erb diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 32d0229f..52351d6b 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -36,4 +36,10 @@ class UserController < ApplicationController @type = :friend render 'show_follow' end + + def questions + @title = 'Questions' + @user = User.where('LOWER(screen_name) = ?', params[:username].downcase).first + @questions = @user.questions.reverse_order.paginate(page: params[:page]) + end end diff --git a/app/views/user/questions.html.haml b/app/views/user/questions.html.haml new file mode 100644 index 00000000..d6ae7e05 --- /dev/null +++ b/app/views/user/questions.html.haml @@ -0,0 +1,17 @@ +.profile--header +.container.j2-page + .col-md-3.col-xs-12.col-sm-3 + = render 'user/profile_info' + .hidden-xs= render 'shared/links' + .col-md-9.col-xs-12.col-sm-9 + %h1.j2-lh= @title + #questions + - @questions.each do |a| + = render 'shared/answerbox', a: a + + #pagination= will_paginate @questions, renderer: BootstrapPagination::Rails, page_links: false + + - if @questions.next_page + %button#load-more-btn.btn.btn-default{type: :button, data: { current_page: @questions.current_page }} + Load more + .visible-xs= render 'shared/links' diff --git a/app/views/user/questions.js.erb b/app/views/user/questions.js.erb new file mode 100644 index 00000000..f648a149 --- /dev/null +++ b/app/views/user/questions.js.erb @@ -0,0 +1,8 @@ +$('#questions').append('<% @questions.each do |a| + %><%= j render 'shared/answerbox', a: a +%><% end %>'); +<% if @questions.next_page %> +$('#pagination').html('<%= j will_paginate @questions, renderer: BootstrapPagination::Rails, page_links: false %>'); +<% else %> +$('#pagination, #load-more-btn').remove(); +<% end %> \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 6e268567..663b0705 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -71,4 +71,5 @@ Rails.application.routes.draw do match '/:username/q/:id', to: 'question#show', via: 'get', as: :show_user_question_alt match '/:username/followers(/p/:page)', to: 'user#followers', via: 'get', as: :show_user_followers_alt, defaults: {page: 1} match '/:username/friends(/p/:page)', to: 'user#friends', via: 'get', as: :show_user_friends_alt, defaults: {page: 1} + match '/:username/questions(/p/:page)', to: 'user#questions', via: 'get', as: :show_user_questions, defaults: {page: 1} end From 75bca2430b556a14e987e6f4954f2a382104d31d Mon Sep 17 00:00:00 2001 From: Andreas N Date: Fri, 19 Dec 2014 22:37:04 +0100 Subject: [PATCH 04/53] added links to pages --- app/views/user/_profile_info.html.haml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/views/user/_profile_info.html.haml b/app/views/user/_profile_info.html.haml index de1376a0..0489c121 100644 --- a/app/views/user/_profile_info.html.haml +++ b/app/views/user/_profile_info.html.haml @@ -33,10 +33,12 @@ %h4.entry-text#friend-count= @user.friend_count %h6.entry-subtext Following .row - .col-md-6.col-sm-6.col-xs-6 - %h4.entry-text#asked-count= @user.asked_count - %h6.entry-subtext Questions - .col-md-6.col-sm-6.col-xs-6 - %h4.entry-text#answered-count= @user.answered_count - %h6.entry-subtext Answers + %a{href: show_user_questions_path(@user.screen_name)} + .col-md-6.col-sm-6.col-xs-6 + %h4.entry-text#asked-count= @user.asked_count + %h6.entry-subtext Questions + %a{href: show_user_profile_path(@user.screen_name)} + .col-md-6.col-sm-6.col-xs-6 + %h4.entry-text#answered-count= @user.answered_count + %h6.entry-subtext Answers = render 'user/actions', user: @user, type: :follower \ No newline at end of file From e9985ed0aa2721e45b67759be35a04e1f6369a9b Mon Sep 17 00:00:00 2001 From: Andreas N Date: Fri, 19 Dec 2014 22:52:12 +0100 Subject: [PATCH 05/53] how about new template --- app/assets/stylesheets/scss/answerbox.scss | 2 +- app/views/shared/_question.html.haml | 14 ++++++++++++++ app/views/user/questions.html.haml | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 app/views/shared/_question.html.haml diff --git a/app/assets/stylesheets/scss/answerbox.scss b/app/assets/stylesheets/scss/answerbox.scss index 45524a49..af1595fe 100644 --- a/app/assets/stylesheets/scss/answerbox.scss +++ b/app/assets/stylesheets/scss/answerbox.scss @@ -1,4 +1,4 @@ -.answerbox .text-muted a, .answerbox .text-muted a:hover { +.text-muted a, .answerbox .text-muted a:hover { color: $gray-dark; text-decoration: none; } diff --git a/app/views/shared/_question.html.haml b/app/views/shared/_question.html.haml new file mode 100644 index 00000000..4636b78d --- /dev/null +++ b/app/views/shared/_question.html.haml @@ -0,0 +1,14 @@ +.panel.panel-default + .media + .media-body + %h6.media-heading.text-muted.answerbox--question-user + = user_screen_name a.question.user + asked + = time_ago_in_words(a.question.created_at) + ago + - if a.question.answer_count > 1 + · + %a{href: show_user_question_path(a.question.user.screen_name, a.question.id)} + #{a.question.answer_count} answers + %p.answerbox--question-text + = a.question.content \ No newline at end of file diff --git a/app/views/user/questions.html.haml b/app/views/user/questions.html.haml index d6ae7e05..1f7411c9 100644 --- a/app/views/user/questions.html.haml +++ b/app/views/user/questions.html.haml @@ -7,7 +7,7 @@ %h1.j2-lh= @title #questions - @questions.each do |a| - = render 'shared/answerbox', a: a + = render 'shared/question', a: a #pagination= will_paginate @questions, renderer: BootstrapPagination::Rails, page_links: false From f7e35a3977403ba5e216f45c8b3332abb151b169 Mon Sep 17 00:00:00 2001 From: Andreas N Date: Fri, 19 Dec 2014 22:56:16 +0100 Subject: [PATCH 06/53] fix stuff --- app/views/shared/_question.html.haml | 10 +++++----- app/views/user/questions.html.haml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/views/shared/_question.html.haml b/app/views/shared/_question.html.haml index 4636b78d..c5513a2e 100644 --- a/app/views/shared/_question.html.haml +++ b/app/views/shared/_question.html.haml @@ -2,13 +2,13 @@ .media .media-body %h6.media-heading.text-muted.answerbox--question-user - = user_screen_name a.question.user + = user_screen_name q.user asked - = time_ago_in_words(a.question.created_at) + = time_ago_in_words(q.created_at) ago - - if a.question.answer_count > 1 + - if q.answer_count > 1 · - %a{href: show_user_question_path(a.question.user.screen_name, a.question.id)} - #{a.question.answer_count} answers + %a{href: show_user_question_path(q.user.screen_name, q.id)} + #{q.answer_count} answers %p.answerbox--question-text = a.question.content \ No newline at end of file diff --git a/app/views/user/questions.html.haml b/app/views/user/questions.html.haml index 1f7411c9..e9835732 100644 --- a/app/views/user/questions.html.haml +++ b/app/views/user/questions.html.haml @@ -6,8 +6,8 @@ .col-md-9.col-xs-12.col-sm-9 %h1.j2-lh= @title #questions - - @questions.each do |a| - = render 'shared/question', a: a + - @questions.each do |q| + = render 'shared/question', a: q #pagination= will_paginate @questions, renderer: BootstrapPagination::Rails, page_links: false From 20796654f59a28f4072d5a5dc2d780bc865e3688 Mon Sep 17 00:00:00 2001 From: Andreas N Date: Fri, 19 Dec 2014 22:57:08 +0100 Subject: [PATCH 07/53] more fix --- app/views/user/questions.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/user/questions.html.haml b/app/views/user/questions.html.haml index e9835732..ef62b70c 100644 --- a/app/views/user/questions.html.haml +++ b/app/views/user/questions.html.haml @@ -7,7 +7,7 @@ %h1.j2-lh= @title #questions - @questions.each do |q| - = render 'shared/question', a: q + = render 'shared/question', q: q #pagination= will_paginate @questions, renderer: BootstrapPagination::Rails, page_links: false From c1f0388da43deebc86b97a08cc1eea16b3c64f70 Mon Sep 17 00:00:00 2001 From: Andreas N Date: Fri, 19 Dec 2014 22:58:06 +0100 Subject: [PATCH 08/53] I reached the end of the file, fixing this I finally did it --- app/views/shared/_question.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shared/_question.html.haml b/app/views/shared/_question.html.haml index c5513a2e..7158cda5 100644 --- a/app/views/shared/_question.html.haml +++ b/app/views/shared/_question.html.haml @@ -11,4 +11,4 @@ %a{href: show_user_question_path(q.user.screen_name, q.id)} #{q.answer_count} answers %p.answerbox--question-text - = a.question.content \ No newline at end of file + = q.content \ No newline at end of file From a76463253818ac02d5d9be650a10ec3e147027fd Mon Sep 17 00:00:00 2001 From: Andreas N Date: Fri, 19 Dec 2014 23:03:03 +0100 Subject: [PATCH 09/53] more fixes and updates --- app/views/shared/_question.html.haml | 27 ++++++++++++++------------- app/views/user/questions.js.erb | 2 +- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/app/views/shared/_question.html.haml b/app/views/shared/_question.html.haml index 7158cda5..f1d6100e 100644 --- a/app/views/shared/_question.html.haml +++ b/app/views/shared/_question.html.haml @@ -1,14 +1,15 @@ .panel.panel-default - .media - .media-body - %h6.media-heading.text-muted.answerbox--question-user - = user_screen_name q.user - asked - = time_ago_in_words(q.created_at) - ago - - if q.answer_count > 1 - · - %a{href: show_user_question_path(q.user.screen_name, q.id)} - #{q.answer_count} answers - %p.answerbox--question-text - = q.content \ No newline at end of file + .panel-body + .media + .media-body + %h6.media-heading.text-muted.answerbox--question-user + = user_screen_name q.user + asked + = time_ago_in_words(q.created_at) + ago + - if q.answer_count > 1 + · + %a{href: show_user_question_path(q.user.screen_name, q.id)} + #{q.answer_count} answers + %p.answerbox--question-text + = q.content \ No newline at end of file diff --git a/app/views/user/questions.js.erb b/app/views/user/questions.js.erb index f648a149..b444b715 100644 --- a/app/views/user/questions.js.erb +++ b/app/views/user/questions.js.erb @@ -1,5 +1,5 @@ $('#questions').append('<% @questions.each do |a| - %><%= j render 'shared/answerbox', a: a + %><%= j render 'shared/question', a: a %><% end %>'); <% if @questions.next_page %> $('#pagination').html('<%= j will_paginate @questions, renderer: BootstrapPagination::Rails, page_links: false %>'); From bdff6f4110abb7c82eeee008f1a566808cfa4895 Mon Sep 17 00:00:00 2001 From: Andreas N Date: Fri, 19 Dec 2014 23:05:45 +0100 Subject: [PATCH 10/53] the journey of fixes has finally an end --- app/views/user/questions.js.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/user/questions.js.erb b/app/views/user/questions.js.erb index b444b715..01344836 100644 --- a/app/views/user/questions.js.erb +++ b/app/views/user/questions.js.erb @@ -1,5 +1,5 @@ -$('#questions').append('<% @questions.each do |a| - %><%= j render 'shared/question', a: a +$('#questions').append('<% @questions.each do |q| + %><%= j render 'shared/question', q: q %><% end %>'); <% if @questions.next_page %> $('#pagination').html('<%= j will_paginate @questions, renderer: BootstrapPagination::Rails, page_links: false %>'); From aa3f11833281bbdf33dd4579e44acf9ba0afb355 Mon Sep 17 00:00:00 2001 From: nilsding Date: Fri, 19 Dec 2014 23:12:19 +0100 Subject: [PATCH 11/53] fixed anonymous questions being shown --- app/controllers/user_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 52351d6b..740e35a4 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -40,6 +40,6 @@ class UserController < ApplicationController def questions @title = 'Questions' @user = User.where('LOWER(screen_name) = ?', params[:username].downcase).first - @questions = @user.questions.reverse_order.paginate(page: params[:page]) + @questions = @user.questions.where(author_is_anonymous: false).reverse_order.paginate(page: params[:page]) end end From f6882d7fff5e46658acfeab25c2b5122f6815e85 Mon Sep 17 00:00:00 2001 From: nilsding Date: Fri, 19 Dec 2014 23:20:33 +0100 Subject: [PATCH 12/53] added justask:fix_notifications task --- Rakefile | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Rakefile b/Rakefile index 83db07a0..6a893c89 100644 --- a/Rakefile +++ b/Rakefile @@ -79,4 +79,22 @@ namespace :justask do puts "#{sprintf "%3d", u.id}. #{u.screen_name}" end end + + desc "Fixes the notifications" + task fix_notifications: :environment do + format = '%t (%c/%C) [%b>%i] %e' + total = Notification.count + progress = ProgressBar.create title: 'Processing notifications', format: format, starting_at: 0, total: total + destroyed_count = 0 + + Notification.all.each do |n| + if n.target.nil? + n.destroy + destroyed_count += 1 + end + progress.increment + end + + puts "\nPurged #{destroyed_count} dead notifications." + end end From 23746221d43275126e2d888d6d3787321a3e4e8e Mon Sep 17 00:00:00 2001 From: nilsding Date: Fri, 19 Dec 2014 23:21:15 +0100 Subject: [PATCH 13/53] removed \n --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 6a893c89..7f7ed899 100644 --- a/Rakefile +++ b/Rakefile @@ -95,6 +95,6 @@ namespace :justask do progress.increment end - puts "\nPurged #{destroyed_count} dead notifications." + puts "Purged #{destroyed_count} dead notifications." end end From 7543da2701df142afb49189958c34c94e0b0f07e Mon Sep 17 00:00:00 2001 From: Andreas N Date: Fri, 19 Dec 2014 23:33:42 +0100 Subject: [PATCH 14/53] move profile things into something different --- app/assets/stylesheets/scss/user.scss | 7 +++++++ app/views/user/_profile_info.html.haml | 21 ++------------------- app/views/user/_stats.html.haml | 21 +++++++++++++++++++++ 3 files changed, 30 insertions(+), 19 deletions(-) create mode 100644 app/views/user/_stats.html.haml diff --git a/app/assets/stylesheets/scss/user.scss b/app/assets/stylesheets/scss/user.scss index 8e51907e..6b02e728 100644 --- a/app/assets/stylesheets/scss/user.scss +++ b/app/assets/stylesheets/scss/user.scss @@ -33,4 +33,11 @@ height: 40vh; background-color: darken($navbar-inverse-bg, 10%); background-size: cover; +} + +.profile--panel .panel-heading { + color: $brand-primary; + border-bottom: 2px solid $brand-primary; + background-color: #fff; + text-transform: uppercase; } \ No newline at end of file diff --git a/app/views/user/_profile_info.html.haml b/app/views/user/_profile_info.html.haml index 0489c121..a9c59c48 100644 --- a/app/views/user/_profile_info.html.haml +++ b/app/views/user/_profile_info.html.haml @@ -23,22 +23,5 @@ %p.profile--text %i.fa.fa-location-arrow = @user.location - .row - %a{href: show_user_followers_path(@user.screen_name)} - .col-md-6.col-sm-6.col-xs-6 - %h4.entry-text#follower-count= @user.follower_count - %h6.entry-subtext Followers - %a{href: show_user_friends_path(@user.screen_name)} - .col-md-6.col-sm-6.col-xs-6 - %h4.entry-text#friend-count= @user.friend_count - %h6.entry-subtext Following - .row - %a{href: show_user_questions_path(@user.screen_name)} - .col-md-6.col-sm-6.col-xs-6 - %h4.entry-text#asked-count= @user.asked_count - %h6.entry-subtext Questions - %a{href: show_user_profile_path(@user.screen_name)} - .col-md-6.col-sm-6.col-xs-6 - %h4.entry-text#answered-count= @user.answered_count - %h6.entry-subtext Answers - = render 'user/actions', user: @user, type: :follower \ No newline at end of file + = render 'user/actions', user: @user, type: :follower += render 'user/stats', user: @user \ No newline at end of file diff --git a/app/views/user/_stats.html.haml b/app/views/user/_stats.html.haml new file mode 100644 index 00000000..2660d7ed --- /dev/null +++ b/app/views/user/_stats.html.haml @@ -0,0 +1,21 @@ +.panel.panel-default.profile--panel + .panel-heading + %h3.panel-title Stats + .row + %a{href: show_user_followers_path(@user.screen_name)} + .col-md-6.col-sm-6.col-xs-6 + %h4.entry-text#follower-count= @user.follower_count + %h6.entry-subtext Followers + %a{href: show_user_friends_path(@user.screen_name)} + .col-md-6.col-sm-6.col-xs-6 + %h4.entry-text#friend-count= @user.friend_count + %h6.entry-subtext Following + .row + %a{href: show_user_questions_path(@user.screen_name)} + .col-md-6.col-sm-6.col-xs-6 + %h4.entry-text#asked-count= @user.asked_count + %h6.entry-subtext Questions + %a{href: show_user_profile_path(@user.screen_name)} + .col-md-6.col-sm-6.col-xs-6 + %h4.entry-text#answered-count= @user.answered_count + %h6.entry-subtext Answers \ No newline at end of file From b074abad4dcfbfd5f9041d74ea5c4e220923e85b Mon Sep 17 00:00:00 2001 From: Andreas N Date: Fri, 19 Dec 2014 23:35:54 +0100 Subject: [PATCH 15/53] fuck panel-body --- app/views/user/_stats.html.haml | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/app/views/user/_stats.html.haml b/app/views/user/_stats.html.haml index 2660d7ed..cbdf19c5 100644 --- a/app/views/user/_stats.html.haml +++ b/app/views/user/_stats.html.haml @@ -1,21 +1,22 @@ .panel.panel-default.profile--panel .panel-heading %h3.panel-title Stats - .row - %a{href: show_user_followers_path(@user.screen_name)} - .col-md-6.col-sm-6.col-xs-6 - %h4.entry-text#follower-count= @user.follower_count - %h6.entry-subtext Followers - %a{href: show_user_friends_path(@user.screen_name)} - .col-md-6.col-sm-6.col-xs-6 - %h4.entry-text#friend-count= @user.friend_count - %h6.entry-subtext Following + .panel-body .row - %a{href: show_user_questions_path(@user.screen_name)} + %a{href: show_user_followers_path(@user.screen_name)} .col-md-6.col-sm-6.col-xs-6 - %h4.entry-text#asked-count= @user.asked_count - %h6.entry-subtext Questions - %a{href: show_user_profile_path(@user.screen_name)} + %h4.entry-text#follower-count= @user.follower_count + %h6.entry-subtext Followers + %a{href: show_user_friends_path(@user.screen_name)} .col-md-6.col-sm-6.col-xs-6 - %h4.entry-text#answered-count= @user.answered_count - %h6.entry-subtext Answers \ No newline at end of file + %h4.entry-text#friend-count= @user.friend_count + %h6.entry-subtext Following + .row + %a{href: show_user_questions_path(@user.screen_name)} + .col-md-6.col-sm-6.col-xs-6 + %h4.entry-text#asked-count= @user.asked_count + %h6.entry-subtext Questions + %a{href: show_user_profile_path(@user.screen_name)} + .col-md-6.col-sm-6.col-xs-6 + %h4.entry-text#answered-count= @user.answered_count + %h6.entry-subtext Answers \ No newline at end of file From 5d19a975f30d928f33a52cb3a8c13d8dd39cea8e Mon Sep 17 00:00:00 2001 From: Andreas N Date: Fri, 19 Dec 2014 23:38:09 +0100 Subject: [PATCH 16/53] indentation is my best friend --- app/views/user/_stats.html.haml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/user/_stats.html.haml b/app/views/user/_stats.html.haml index cbdf19c5..b6ff4d5d 100644 --- a/app/views/user/_stats.html.haml +++ b/app/views/user/_stats.html.haml @@ -11,12 +11,12 @@ .col-md-6.col-sm-6.col-xs-6 %h4.entry-text#friend-count= @user.friend_count %h6.entry-subtext Following - .row - %a{href: show_user_questions_path(@user.screen_name)} - .col-md-6.col-sm-6.col-xs-6 - %h4.entry-text#asked-count= @user.asked_count - %h6.entry-subtext Questions - %a{href: show_user_profile_path(@user.screen_name)} - .col-md-6.col-sm-6.col-xs-6 - %h4.entry-text#answered-count= @user.answered_count - %h6.entry-subtext Answers \ No newline at end of file + .row + %a{href: show_user_questions_path(@user.screen_name)} + .col-md-6.col-sm-6.col-xs-6 + %h4.entry-text#asked-count= @user.asked_count + %h6.entry-subtext Questions + %a{href: show_user_profile_path(@user.screen_name)} + .col-md-6.col-sm-6.col-xs-6 + %h4.entry-text#answered-count= @user.answered_count + %h6.entry-subtext Answers \ No newline at end of file From cc3dcdddd5f6e818b657f597a15f549843229820 Mon Sep 17 00:00:00 2001 From: Andreas N Date: Fri, 19 Dec 2014 23:41:15 +0100 Subject: [PATCH 17/53] more view fixes --- app/assets/stylesheets/scss/user.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/scss/user.scss b/app/assets/stylesheets/scss/user.scss index 6b02e728..3b6b19fa 100644 --- a/app/assets/stylesheets/scss/user.scss +++ b/app/assets/stylesheets/scss/user.scss @@ -40,4 +40,8 @@ border-bottom: 2px solid $brand-primary; background-color: #fff; text-transform: uppercase; +} + +.profile--panel .panel-body { + padding-top: 0px; } \ No newline at end of file From 368949a031f3a2b83d7c92a5a9ceac7e02090837 Mon Sep 17 00:00:00 2001 From: Andreas N Date: Sat, 20 Dec 2014 00:03:07 +0100 Subject: [PATCH 18/53] fix design stuff --- app/views/user/questions.html.haml | 3 ++- app/views/user/show_follow.html.haml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/user/questions.html.haml b/app/views/user/questions.html.haml index ef62b70c..b70324e7 100644 --- a/app/views/user/questions.html.haml +++ b/app/views/user/questions.html.haml @@ -4,7 +4,8 @@ = render 'user/profile_info' .hidden-xs= render 'shared/links' .col-md-9.col-xs-12.col-sm-9 - %h1.j2-lh= @title + %h1.j2-lh.hidden-xs= @title + %h1.visible-xs= @title #questions - @questions.each do |q| = render 'shared/question', q: q diff --git a/app/views/user/show_follow.html.haml b/app/views/user/show_follow.html.haml index 89e428de..c7c0cdea 100644 --- a/app/views/user/show_follow.html.haml +++ b/app/views/user/show_follow.html.haml @@ -4,7 +4,8 @@ = render 'user/profile_info' .hidden-xs= render 'shared/links' .col-md-9.col-xs-12.col-sm-9 - %h1.j2-lh= @title + %h1.j2-lh.hidden-xs= @title + %h1.visible-xs= @title #users - @users.each do |user| .col-sm-6 From 5aa6248cb135f28937668590316be30204b57183 Mon Sep 17 00:00:00 2001 From: Andreas N Date: Sat, 20 Dec 2014 01:37:05 +0100 Subject: [PATCH 19/53] icon bar animation shows up when you have new notifications --- app/views/layouts/_header.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml index 977f37c9..32bab7a8 100644 --- a/app/views/layouts/_header.html.haml +++ b/app/views/layouts/_header.html.haml @@ -4,7 +4,7 @@ %button.navbar-toggle{"data-target" => "#j2-main-navbar-collapse", "data-toggle" => "collapse", type: "button"} %span.sr-only Toggle navigation - if user_signed_in? - - unless inbox_count.nil? + - unless inbox_count.nil? or notification_count.nil? %span.icon-bar.navbar--inbox-animation %span.icon-bar.navbar--inbox-animation %span.icon-bar.navbar--inbox-animation From ba9b6d1e1288afee205168f37a4a9cf6a2bb441b Mon Sep 17 00:00:00 2001 From: Andreas N Date: Sat, 20 Dec 2014 02:14:27 +0100 Subject: [PATCH 20/53] add link to question/answer in question display --- app/views/shared/_question.html.haml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/shared/_question.html.haml b/app/views/shared/_question.html.haml index f1d6100e..d2b79ee3 100644 --- a/app/views/shared/_question.html.haml +++ b/app/views/shared/_question.html.haml @@ -5,8 +5,9 @@ %h6.media-heading.text-muted.answerbox--question-user = user_screen_name q.user asked - = time_ago_in_words(q.created_at) - ago + %a{href: show_user_question_path(q.user.screen_name, q.id)} + = time_ago_in_words(q.created_at) + ago - if q.answer_count > 1 · %a{href: show_user_question_path(q.user.screen_name, q.id)} From 000fa09a5e29177e1c0d07a880937b5491947899 Mon Sep 17 00:00:00 2001 From: Andreas N Date: Sat, 20 Dec 2014 14:37:14 +0100 Subject: [PATCH 21/53] restructure inbox design --- app/assets/stylesheets/scss/user.scss | 14 ++++++++++++++ app/views/inbox/show.html.haml | 20 +++++++++++++------- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/scss/user.scss b/app/assets/stylesheets/scss/user.scss index 3b6b19fa..896a8f4b 100644 --- a/app/assets/stylesheets/scss/user.scss +++ b/app/assets/stylesheets/scss/user.scss @@ -44,4 +44,18 @@ .profile--panel .panel-body { padding-top: 0px; +} + +.inbox--panel .panel-heading { + color: $brand-info; + border-bottom: 2px solid $brand-info; + background-color: #fff; + text-transform: uppercase; +} + +.warning--panel .panel-heading { + color: $brand-danger; + border-bottom: 2px solid $brand-danger; + background-color: #fff; + text-transform: uppercase; } \ No newline at end of file diff --git a/app/views/inbox/show.html.haml b/app/views/inbox/show.html.haml index 7506b491..a71ab125 100644 --- a/app/views/inbox/show.html.haml +++ b/app/views/inbox/show.html.haml @@ -1,12 +1,18 @@ .container.j2-page + .row + .col-md-3.col-xs-12.col-sm-3 + .panel.panel-default.inbox--panel + .panel-heading + %h3 Out of questions? + .panel-body + %button.btn.btn-block.btn-info{type: :button, id: 'ib-generate-question'} Get new question + .panel.panel-default.warning--panel + .panel-heading + %h3 Actions + .panel-body + %button.btn.btn-block.btn-danger{type: :button, id: 'ib-delete-all'} Delete all questions + .col-md-9.col-xs-12.col-sm-9 = render 'layouts/messages' - .alert.alert-info - .row - .col-md-9.col-sm-8.col-xs-12 - Out of questions? - .col-md-3.col-sm-5.col-xs-12 - %button.btn.btn-block.btn-info{type: :button, id: 'ib-generate-question'} Get new question - #entries - @inbox.each do |i| = render 'inbox/entry', i: i From 55f1680c18c23a34e9901c1b5fdc4405a5faa94d Mon Sep 17 00:00:00 2001 From: Andreas N Date: Sat, 20 Dec 2014 16:15:59 +0100 Subject: [PATCH 22/53] hide delete inbox for now --- app/views/inbox/show.html.haml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/views/inbox/show.html.haml b/app/views/inbox/show.html.haml index a71ab125..d1e91e77 100644 --- a/app/views/inbox/show.html.haml +++ b/app/views/inbox/show.html.haml @@ -6,11 +6,12 @@ %h3 Out of questions? .panel-body %button.btn.btn-block.btn-info{type: :button, id: 'ib-generate-question'} Get new question - .panel.panel-default.warning--panel - .panel-heading - %h3 Actions - .panel-body - %button.btn.btn-block.btn-danger{type: :button, id: 'ib-delete-all'} Delete all questions + / + .panel.panel-default.warning--panel + .panel-heading + %h3 Actions + .panel-body + %button.btn.btn-block.btn-danger{type: :button, id: 'ib-delete-all'} Delete all questions .col-md-9.col-xs-12.col-sm-9 = render 'layouts/messages' #entries From 1ba34c59d0c46d3b3ad168b0e0eb2d8a63fca5bf Mon Sep 17 00:00:00 2001 From: nilsding Date: Sun, 21 Dec 2014 13:41:57 +0100 Subject: [PATCH 23/53] added "delete all questions" button thing --- app/assets/javascripts/inbox.coffee | 25 ++++++++++++++++++++++++ app/controllers/ajax/inbox_controller.rb | 16 +++++++++++++++ app/views/inbox/show.html.haml | 23 +++++++++++----------- config/routes.rb | 1 + 4 files changed, 53 insertions(+), 12 deletions(-) diff --git a/app/assets/javascripts/inbox.coffee b/app/assets/javascripts/inbox.coffee index 87bd87e9..100f5d5c 100644 --- a/app/assets/javascripts/inbox.coffee +++ b/app/assets/javascripts/inbox.coffee @@ -14,12 +14,36 @@ complete: (jqxhr, status) -> btn.button "reset" + +($ document).on "click", "button#ib-delete-all", -> + if confirm 'Are you sure?' + btn = ($ this) + btn.button "loading" + $.ajax + url: '/ajax/delete_all_inbox' + type: 'POST' + dataType: 'json' + success: (data, status, jqxhr) -> + if data.success + entries = ($ "div#entries") + entries.slideUp 400, -> + entries.html("Nothing to see here.") + entries.fadeIn() + btn.attr("disabled", "disabled") + error: (jqxhr, status, error) -> + console.log jqxhr, status, error + showNotification "An error occurred, a developer should check the console for details", false + complete: (jqxhr, status) -> + btn.button "reset" + + $(document).on "keydown", "textarea[name=ib-answer]", (evt) -> iid = $(this)[0].dataset.id if evt.keyCode == 13 and evt.ctrlKey # trigger warning: $("button[name=ib-answer][data-ib-id=#{iid}]").trigger 'click' + $(document).on "click", "button[name=ib-answer]", -> btn = $(this) btn.button "loading" @@ -48,6 +72,7 @@ $(document).on "click", "button[name=ib-answer]", -> btn.button "reset" $("textarea[name=ib-answer][data-id=#{iid}]").removeAttr "readonly" + $(document).on "click", "button[name=ib-destroy]", -> if confirm 'Are you sure?' btn = $(this) diff --git a/app/controllers/ajax/inbox_controller.rb b/app/controllers/ajax/inbox_controller.rb index 88393659..21ff83dc 100644 --- a/app/controllers/ajax/inbox_controller.rb +++ b/app/controllers/ajax/inbox_controller.rb @@ -85,4 +85,20 @@ class Ajax::InboxController < ApplicationController @message = "Successfully deleted question." @success = true end + + def remove_all + begin + Inbox.where(user: current_user).each { |i| i.remove } + rescue + @status = :err + @message = "An error occurred" + @success = false + return + end + + @status = :okay + @message = "Successfully deleted questions." + @success = true + render 'ajax/inbox/remove' + end end diff --git a/app/views/inbox/show.html.haml b/app/views/inbox/show.html.haml index d1e91e77..4a432471 100644 --- a/app/views/inbox/show.html.haml +++ b/app/views/inbox/show.html.haml @@ -6,21 +6,20 @@ %h3 Out of questions? .panel-body %button.btn.btn-block.btn-info{type: :button, id: 'ib-generate-question'} Get new question - / - .panel.panel-default.warning--panel - .panel-heading - %h3 Actions - .panel-body - %button.btn.btn-block.btn-danger{type: :button, id: 'ib-delete-all'} Delete all questions + .panel.panel-default.warning--panel + .panel-heading + %h3 Actions + .panel-body + %button.btn.btn-block.btn-danger{type: :button, id: 'ib-delete-all'} Delete all questions .col-md-9.col-xs-12.col-sm-9 - = render 'layouts/messages' - #entries - - @inbox.each do |i| - = render 'inbox/entry', i: i + = render 'layouts/messages' + #entries + - @inbox.each do |i| + = render 'inbox/entry', i: i - - if @inbox.empty? + - if @inbox.empty? - Nothing to see here. + Nothing to see here. = render "shared/links" - @inbox.update_all(new: false) \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 663b0705..cc6ccb8a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -46,6 +46,7 @@ Rails.application.routes.draw do match '/answer', to: 'inbox#destroy', via: :post, as: :answer match '/generate_question', to: 'inbox#create', via: :post, as: :generate_question match '/delete_inbox', to: 'inbox#remove', via: :post, as: :delete_inbox + match '/delete_all_inbox', to: 'inbox#remove_all', via: :post, as: :delete_all_inbox match '/destroy_answer', to: 'answer#destroy', via: :post, as: :destroy_answer match '/create_friend', to: 'friend#create', via: :post, as: :create_friend match '/destroy_friend', to: 'friend#destroy', via: :post, as: :destroy_friend From 7a1879024196b69ade12b9d771f26d4e93a6420a Mon Sep 17 00:00:00 2001 From: nilsding Date: Sun, 21 Dec 2014 14:11:35 +0100 Subject: [PATCH 24/53] added disable attribute if there are no questions in the inbox --- app/assets/javascripts/inbox.coffee | 5 ++++- app/views/inbox/show.html.haml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/inbox.coffee b/app/assets/javascripts/inbox.coffee index 100f5d5c..b4b28998 100644 --- a/app/assets/javascripts/inbox.coffee +++ b/app/assets/javascripts/inbox.coffee @@ -19,22 +19,25 @@ if confirm 'Are you sure?' btn = ($ this) btn.button "loading" + succ = no $.ajax url: '/ajax/delete_all_inbox' type: 'POST' dataType: 'json' success: (data, status, jqxhr) -> if data.success + succ = yes entries = ($ "div#entries") entries.slideUp 400, -> entries.html("Nothing to see here.") entries.fadeIn() - btn.attr("disabled", "disabled") error: (jqxhr, status, error) -> console.log jqxhr, status, error showNotification "An error occurred, a developer should check the console for details", false complete: (jqxhr, status) -> btn.button "reset" + if succ + btn.attr "disabled", "disabled" # this doesn't really work like I wanted it to… $(document).on "keydown", "textarea[name=ib-answer]", (evt) -> diff --git a/app/views/inbox/show.html.haml b/app/views/inbox/show.html.haml index 4a432471..a585a294 100644 --- a/app/views/inbox/show.html.haml +++ b/app/views/inbox/show.html.haml @@ -10,7 +10,7 @@ .panel-heading %h3 Actions .panel-body - %button.btn.btn-block.btn-danger{type: :button, id: 'ib-delete-all'} Delete all questions + %button.btn.btn-block.btn-danger{type: :button, id: 'ib-delete-all', disabled: (@inbox.empty? ? 'disabled' : nil)} Delete all questions .col-md-9.col-xs-12.col-sm-9 = render 'layouts/messages' #entries From dc0b105b4600843a40bdad03c7b92a05237f5a75 Mon Sep 17 00:00:00 2001 From: nilsding Date: Sun, 21 Dec 2014 14:28:33 +0100 Subject: [PATCH 25/53] added .panel-title --- app/views/inbox/show.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/inbox/show.html.haml b/app/views/inbox/show.html.haml index a585a294..afce224b 100644 --- a/app/views/inbox/show.html.haml +++ b/app/views/inbox/show.html.haml @@ -3,12 +3,12 @@ .col-md-3.col-xs-12.col-sm-3 .panel.panel-default.inbox--panel .panel-heading - %h3 Out of questions? + %h3.panel-title Out of questions? .panel-body %button.btn.btn-block.btn-info{type: :button, id: 'ib-generate-question'} Get new question .panel.panel-default.warning--panel .panel-heading - %h3 Actions + %h3.panel-title Actions .panel-body %button.btn.btn-block.btn-danger{type: :button, id: 'ib-delete-all', disabled: (@inbox.empty? ? 'disabled' : nil)} Delete all questions .col-md-9.col-xs-12.col-sm-9 From 36f069d9589605324a3d71d474b4dac7c15e23e5 Mon Sep 17 00:00:00 2001 From: nilsding Date: Sun, 21 Dec 2014 15:31:18 +0100 Subject: [PATCH 26/53] modified error pages a bit --- public/404.html | 110 ++++++++++++++++++------------- public/422.html | 110 ++++++++++++++++++------------- public/500.html | 112 +++++++++++++++++++------------- public/502.html | 86 ++++++++++++++++++++++++ public/images/angry_unicorn.png | Bin 0 -> 37581 bytes 5 files changed, 282 insertions(+), 136 deletions(-) create mode 100644 public/502.html create mode 100644 public/images/angry_unicorn.png diff --git a/public/404.html b/public/404.html index 5503b7e7..220d07c4 100644 --- a/public/404.html +++ b/public/404.html @@ -1,59 +1,75 @@ - The page you were looking for doesn't exist (404) + Page not found!!1! (404) -
@@ -62,5 +78,9 @@

If you think you found a bug, please let us know.

+
+ Bug tracker · + Twitter +
diff --git a/public/422.html b/public/422.html index 1c971ab3..b364fad1 100644 --- a/public/422.html +++ b/public/422.html @@ -4,63 +4,83 @@ The change you wanted was rejected (422) -

The change you wanted was rejected.

Maybe you tried to change something you didn't have access to.

-

If you think you found a bug, please let us know.

+

If you think you found a bug, please please let us know.

+
+
+ Bug tracker · + Twitter
diff --git a/public/500.html b/public/500.html index eb240d94..c528dbb8 100644 --- a/public/500.html +++ b/public/500.html @@ -4,62 +4,82 @@ We're sorry, but something went wrong (500) -
-

We're sorry, but something went wrong.

+

Looks like something went wrong!

-

If you think you found a bug, please let us know.

+

This usually happens due to an error in our code. If you think you found a bug, please let us know.

+
+
+ Bug tracker · + Twitter
diff --git a/public/502.html b/public/502.html new file mode 100644 index 00000000..f92daf76 --- /dev/null +++ b/public/502.html @@ -0,0 +1,86 @@ + + + + Unicorn! (502) + + + + +
+
+

This page takes way too long to load!

+ Unicorn +
+

Sorry about that. Please try refreshing and contact us if the problem persists.

+
+
+ Bug tracker · + Twitter +
+ + diff --git a/public/images/angry_unicorn.png b/public/images/angry_unicorn.png new file mode 100644 index 0000000000000000000000000000000000000000..86b2beb60dcb0b237b33b22ebf2e3451cfa932e8 GIT binary patch literal 37581 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 FV1mem3Dy7r literal 0 HcmV?d00001 From 0ddb1a609c135108cdf11bfa425a4e523b71cc68 Mon Sep 17 00:00:00 2001 From: nilsding Date: Sun, 21 Dec 2014 15:32:49 +0100 Subject: [PATCH 27/53] the 404 page is shown again if an user was not found --- app/controllers/user_controller.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 740e35a4..cc560d54 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -1,6 +1,6 @@ class UserController < ApplicationController def show - @user = User.where('LOWER(screen_name) = ?', params[:username].downcase).first + @user = User.where('LOWER(screen_name) = ?', params[:username].downcase).first! @answers = @user.answers.reverse_order.paginate(page: params[:page]) respond_to do |format| format.html @@ -23,7 +23,7 @@ class UserController < ApplicationController def followers @title = 'Followers' - @user = User.where('LOWER(screen_name) = ?', params[:username].downcase).first + @user = User.where('LOWER(screen_name) = ?', params[:username].downcase).first! @users = @user.followers.reverse_order.paginate(page: params[:page]) @type = :friend render 'show_follow' @@ -31,7 +31,7 @@ class UserController < ApplicationController def friends @title = 'Following' - @user = User.where('LOWER(screen_name) = ?', params[:username].downcase).first + @user = User.where('LOWER(screen_name) = ?', params[:username].downcase).first! @users = @user.friends.reverse_order.paginate(page: params[:page]) @type = :friend render 'show_follow' @@ -39,7 +39,7 @@ class UserController < ApplicationController def questions @title = 'Questions' - @user = User.where('LOWER(screen_name) = ?', params[:username].downcase).first + @user = User.where('LOWER(screen_name) = ?', params[:username].downcase).first! @questions = @user.questions.where(author_is_anonymous: false).reverse_order.paginate(page: params[:page]) end end From 2169a866154c86a5781f2493ef626f7d1aa2f161 Mon Sep 17 00:00:00 2001 From: nilsding Date: Sun, 21 Dec 2014 15:36:57 +0100 Subject: [PATCH 28/53] added a count --- app/assets/javascripts/inbox.coffee | 6 ++++-- app/views/inbox/show.html.haml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/inbox.coffee b/app/assets/javascripts/inbox.coffee index b4b28998..39c32445 100644 --- a/app/assets/javascripts/inbox.coffee +++ b/app/assets/javascripts/inbox.coffee @@ -16,8 +16,9 @@ ($ document).on "click", "button#ib-delete-all", -> - if confirm 'Are you sure?' - btn = ($ this) + btn = ($ this) + count = btn[0].dataset.ibCount + if confirm "Really delete #{count} questions?" btn.button "loading" succ = no $.ajax @@ -38,6 +39,7 @@ btn.button "reset" if succ btn.attr "disabled", "disabled" # this doesn't really work like I wanted it to… + btn[0].dataset.ibCount = 0 $(document).on "keydown", "textarea[name=ib-answer]", (evt) -> diff --git a/app/views/inbox/show.html.haml b/app/views/inbox/show.html.haml index afce224b..22394fe5 100644 --- a/app/views/inbox/show.html.haml +++ b/app/views/inbox/show.html.haml @@ -10,7 +10,7 @@ .panel-heading %h3.panel-title Actions .panel-body - %button.btn.btn-block.btn-danger{type: :button, id: 'ib-delete-all', disabled: (@inbox.empty? ? 'disabled' : nil)} Delete all questions + %button.btn.btn-block.btn-danger{type: :button, id: 'ib-delete-all', disabled: (@inbox.empty? ? 'disabled' : nil), data: { ib_count: @inbox.count }} Delete all questions .col-md-9.col-xs-12.col-sm-9 = render 'layouts/messages' #entries From e8f4c2662ac962af09f4349344e1f01c5a988ccb Mon Sep 17 00:00:00 2001 From: nilsding Date: Sun, 21 Dec 2014 16:40:10 +0100 Subject: [PATCH 29/53] goddamnit Karim --- app/assets/javascripts/inbox.coffee | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/javascripts/inbox.coffee b/app/assets/javascripts/inbox.coffee index 39c32445..32abdec6 100644 --- a/app/assets/javascripts/inbox.coffee +++ b/app/assets/javascripts/inbox.coffee @@ -8,6 +8,10 @@ success: (data, status, jqxhr) -> if data.success ($ "div#entries").prepend(data.render) # TODO: slideDown or something + # GitHub issue #26: + del_all_btn = ($ "button#ib-delete-all") + del_all_btn.removeAttr 'disabled' + del_all_btn[0].dataset.ibCount = 1 error: (jqxhr, status, error) -> console.log jqxhr, status, error showNotification "An error occurred, a developer should check the console for details", false From 6ac9af787e059648fddf15277b765f06882791d6 Mon Sep 17 00:00:00 2001 From: nilsding Date: Sun, 21 Dec 2014 22:12:59 +0100 Subject: [PATCH 30/53] added Capistrano --- .capistrano/metrics | 1 + Capfile | 24 ++++++++++++++ Gemfile | 5 +++ Gemfile.lock | 26 +++++++++++++++ bin/cap | 16 +++++++++ bin/capify | 16 +++++++++ config/deploy.rb | 31 ++++++++++++++++++ config/deploy/production.rb | 7 ++++ config/deploy/staging.rb | 45 ++++++++++++++++++++++++++ lib/{assets => capistrano/tasks}/.keep | 0 spec/factories/notifications.rb | 9 ++++++ spec/models/notification_spec.rb | 5 +++ 12 files changed, 185 insertions(+) create mode 100644 .capistrano/metrics create mode 100644 Capfile create mode 100755 bin/cap create mode 100755 bin/capify create mode 100644 config/deploy.rb create mode 100644 config/deploy/production.rb create mode 100644 config/deploy/staging.rb rename lib/{assets => capistrano/tasks}/.keep (100%) create mode 100644 spec/factories/notifications.rb create mode 100644 spec/models/notification_spec.rb diff --git a/.capistrano/metrics b/.capistrano/metrics new file mode 100644 index 00000000..94a4335e --- /dev/null +++ b/.capistrano/metrics @@ -0,0 +1 @@ +full \ No newline at end of file diff --git a/Capfile b/Capfile new file mode 100644 index 00000000..6e64843e --- /dev/null +++ b/Capfile @@ -0,0 +1,24 @@ +# Load DSL and set up stages +require 'capistrano/setup' + +# Include default deployment tasks +require 'capistrano/deploy' + +# Include tasks from other gems included in your Gemfile +# +# For documentation on these, see for example: +# +# https://github.com/capistrano/rvm +# https://github.com/capistrano/rbenv +# https://github.com/capistrano/chruby +# https://github.com/capistrano/bundler +# https://github.com/capistrano/rails +# https://github.com/capistrano/passenger +# +require 'capistrano/rvm' +require 'capistrano/bundler' +require 'capistrano/rails' +require 'capistrano/console' + +# Load custom tasks from `lib/capistrano/tasks' if you have any defined +Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r } diff --git a/Gemfile b/Gemfile index 3db7a191..af1d4a74 100644 --- a/Gemfile +++ b/Gemfile @@ -48,6 +48,11 @@ gem 'foreman' group :development do gem 'spring' + + # Capistrano for deployment + gem 'capistrano', '~> 3.1' + gem 'capistrano-rvm', group: :rvm + gem 'capistrano-rails', '~> 1.1' end group :production do diff --git a/Gemfile.lock b/Gemfile.lock index 438e7b2f..c19e111c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -44,6 +44,21 @@ GEM railties (>= 3.1) buftok (0.2.0) builder (3.2.2) + capistrano (3.3.5) + capistrano-stats (~> 1.1.0) + i18n + rake (>= 10.0.0) + sshkit (~> 1.3) + capistrano-bundler (1.1.3) + capistrano (~> 3.1) + sshkit (~> 1.2) + capistrano-rails (1.1.2) + capistrano (~> 3.1) + capistrano-bundler (~> 1.1) + capistrano-rvm (0.1.2) + capistrano (~> 3.0) + sshkit (~> 1.2) + capistrano-stats (1.1.1) capybara (2.4.4) mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -60,6 +75,7 @@ GEM coffee-script-source execjs coffee-script-source (1.8.0) + colorize (0.7.5) connection_pool (2.1.0) daemons (1.1.9) database_cleaner (1.3.0) @@ -131,6 +147,9 @@ GEM mysql2 (0.3.17) naught (1.0.0) nested_form (0.3.2) + net-scp (1.2.1) + net-ssh (>= 2.6.5) + net-ssh (2.9.1) nokogiri (1.6.5) mini_portile (~> 0.6.0) nprogress-rails (0.1.6.3) @@ -254,6 +273,10 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) + sshkit (1.6.1) + colorize (>= 0.7.0) + net-scp (>= 1.1.2) + net-ssh (>= 2.8.0) thin (1.6.3) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0) @@ -302,6 +325,9 @@ DEPENDENCIES bootstrap-sass (~> 3.2.0.1) bootstrap_form bootswatch-rails + capistrano (~> 3.1) + capistrano-rails (~> 1.1) + capistrano-rvm capybara coffee-rails (~> 4.1.0) database_cleaner diff --git a/bin/cap b/bin/cap new file mode 100755 index 00000000..30352d4d --- /dev/null +++ b/bin/cap @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# +# This file was generated by Bundler. +# +# The application 'cap' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +require 'pathname' +ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile", + Pathname.new(__FILE__).realpath) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('capistrano', 'cap') diff --git a/bin/capify b/bin/capify new file mode 100755 index 00000000..0f486e81 --- /dev/null +++ b/bin/capify @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby +# +# This file was generated by Bundler. +# +# The application 'capify' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +require 'pathname' +ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile", + Pathname.new(__FILE__).realpath) + +require 'rubygems' +require 'bundler/setup' + +load Gem.bin_path('capistrano', 'capify') diff --git a/config/deploy.rb b/config/deploy.rb new file mode 100644 index 00000000..01f44e6d --- /dev/null +++ b/config/deploy.rb @@ -0,0 +1,31 @@ +# config valid only for current version of Capistrano +lock '3.3.5' + +set :application, 'justask' +set :repo_url, 'git@git.rrerr.net:justask/justask.git' +ask :branch, :master +set :deploy_to, '/home/justask/cap/' +set :scm, :git +set :format, :pretty +set :log_level, :debug + +# RVM +set :rvm_type, :user +set :rvm_ruby_version, '2.0.0' + +# Rails +set :conditionally_migrate, true + +namespace :deploy do + + after :updated do + + end + + after :restart, :clear_cache do + on roles(:web), in: :groups, limit: 3, wait: 10 do + + end + end + +end diff --git a/config/deploy/production.rb b/config/deploy/production.rb new file mode 100644 index 00000000..d79adf18 --- /dev/null +++ b/config/deploy/production.rb @@ -0,0 +1,7 @@ +server 'rrerr.net', user: 'justask', roles: %w{web app} + +set :ssh_options, { + keys: %w(~/.ssh/id_rsa), + forward_agent: false, + auth_methods: %w(publickey) +} diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb new file mode 100644 index 00000000..e664a6cd --- /dev/null +++ b/config/deploy/staging.rb @@ -0,0 +1,45 @@ +# Simple Role Syntax +# ================== +# Supports bulk-adding hosts to roles, the primary server in each group +# is considered to be the first unless any hosts have the primary +# property set. Don't declare `role :all`, it's a meta role. + +role :app, %w{deploy@example.com} +role :web, %w{deploy@example.com} +role :db, %w{deploy@example.com} + + +# Extended Server Syntax +# ====================== +# This can be used to drop a more detailed server definition into the +# server list. The second argument is a, or duck-types, Hash and is +# used to set extended properties on the server. + +server 'example.com', user: 'deploy', roles: %w{web app}, my_property: :my_value + + +# Custom SSH Options +# ================== +# You may pass any option but keep in mind that net/ssh understands a +# limited set of options, consult[net/ssh documentation](http://net-ssh.github.io/net-ssh/classes/Net/SSH.html#method-c-start). +# +# Global options +# -------------- +# set :ssh_options, { +# keys: %w(/home/rlisowski/.ssh/id_rsa), +# forward_agent: false, +# auth_methods: %w(password) +# } +# +# And/or per server (overrides global) +# ------------------------------------ +# server 'example.com', +# user: 'user_name', +# roles: %w{web app}, +# ssh_options: { +# user: 'user_name', # overrides user setting above +# keys: %w(/home/user_name/.ssh/id_rsa), +# forward_agent: false, +# auth_methods: %w(publickey password) +# # password: 'please use keys' +# } diff --git a/lib/assets/.keep b/lib/capistrano/tasks/.keep similarity index 100% rename from lib/assets/.keep rename to lib/capistrano/tasks/.keep diff --git a/spec/factories/notifications.rb b/spec/factories/notifications.rb new file mode 100644 index 00000000..79eaba4b --- /dev/null +++ b/spec/factories/notifications.rb @@ -0,0 +1,9 @@ +FactoryGirl.define do + factory :notification do + target_type "MyString" +target_id 1 +recipient_id 1 +new false + end + +end diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb new file mode 100644 index 00000000..f79213f9 --- /dev/null +++ b/spec/models/notification_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Notification, :type => :model do + pending "add some examples to (or delete) #{__FILE__}" +end From b45b273f50a83553f43ee42fd4f4a63e9d907f79 Mon Sep 17 00:00:00 2001 From: nilsding Date: Sun, 21 Dec 2014 22:29:52 +0100 Subject: [PATCH 31/53] I TAKE A LOOK AT MY ENORMOUS MEMES --- .../javascripts/application.js.erb.coffee | 1 + app/assets/javascripts/memes.coffee | 5 + lib/assets/javascripts/cheet.js | 279 ++++++++++++++++++ 3 files changed, 285 insertions(+) create mode 100644 app/assets/javascripts/memes.coffee create mode 100644 lib/assets/javascripts/cheet.js diff --git a/app/assets/javascripts/application.js.erb.coffee b/app/assets/javascripts/application.js.erb.coffee index 3693840e..f37ea0b7 100644 --- a/app/assets/javascripts/application.js.erb.coffee +++ b/app/assets/javascripts/application.js.erb.coffee @@ -6,6 +6,7 @@ #= require nprogress #= require nprogress-turbolinks #= require growl +#= require cheet #= require_tree . NProgress.configure diff --git a/app/assets/javascripts/memes.coffee b/app/assets/javascripts/memes.coffee new file mode 100644 index 00000000..6f01e963 --- /dev/null +++ b/app/assets/javascripts/memes.coffee @@ -0,0 +1,5 @@ +memes = 'up up down down left right left right b a' +cheet memes, -> + cheet.disable memes + ($ "body").addClass 'fa-spin' + ($ "p.answerbox--question-text").each (i) -> ($ this).html ":^)" \ No newline at end of file diff --git a/lib/assets/javascripts/cheet.js b/lib/assets/javascripts/cheet.js new file mode 100644 index 00000000..dd0806f3 --- /dev/null +++ b/lib/assets/javascripts/cheet.js @@ -0,0 +1,279 @@ +/* +The MIT License (MIT) + +Copyright (c) 2013 Louis Acresti + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ + + +(function (global) { + 'use strict'; + + var cheet, + sequences = {}, + keys = { + backspace: 8, + tab: 9, + enter: 13, + 'return': 13, + shift: 16, + '⇧': 16, + control: 17, + ctrl: 17, + '⌃': 17, + alt: 18, + option: 18, + '⌥': 18, + pause: 19, + capslock: 20, + esc: 27, + space: 32, + pageup: 33, + pagedown: 34, + end: 35, + home: 36, + left: 37, + L: 37, + '←': 37, + up: 38, + U: 38, + '↑': 38, + right: 39, + R: 39, + '→': 39, + down: 40, + D: 40, + '↓': 40, + insert: 45, + 'delete': 46, + '0': 48, + '1': 49, + '2': 50, + '3': 51, + '4': 52, + '5': 53, + '6': 54, + '7': 55, + '8': 56, + '9': 57, + a: 65, + b: 66, + c: 67, + d: 68, + e: 69, + f: 70, + g: 71, + h: 72, + i: 73, + j: 74, + k: 75, + l: 76, + m: 77, + n: 78, + o: 79, + p: 80, + q: 81, + r: 82, + s: 83, + t: 84, + u: 85, + v: 86, + w: 87, + x: 88, + y: 89, + z: 90, + '⌘': 91, + command: 91, + kp_0: 96, + kp_1: 97, + kp_2: 98, + kp_3: 99, + kp_4: 100, + kp_5: 101, + kp_6: 102, + kp_7: 103, + kp_8: 104, + kp_9: 105, + kp_multiply: 106, + kp_plus: 107, + kp_minus: 109, + kp_decimal: 110, + kp_divide: 111, + f1: 112, + f2: 113, + f3: 114, + f4: 115, + f5: 116, + f6: 117, + f7: 118, + f8: 119, + f9: 120, + f10: 121, + f11: 122, + f12: 123, + equal: 187, + '=': 187, + comma: 188, + ',': 188, + minus: 189, + '-': 189, + period: 190, + '.': 190 + }, + Sequence, + NOOP = function NOOP() {}, + held = {}; + + Sequence = function Sequence (str, next, fail, done) { + var i; + + this.str = str; + this.next = next ? next : NOOP; + this.fail = fail ? fail : NOOP; + this.done = done ? done : NOOP; + + this.seq = str.split(' '); + this.keys = []; + + for (i=0; i 0) { + this.reset(); + this.fail(this.str); + cheet.__fail(this.str); + } + return; + } + + this.next(this.str, this.seq[i], i, this.seq); + cheet.__next(this.str, this.seq[i], i, this.seq); + + if (++this.idx === this.keys.length) { + this.done(this.str); + cheet.__done(this.str); + this.reset(); + } + }; + + Sequence.prototype.reset = function () { + this.idx = 0; + }; + + cheet = function cheet (str, handlers) { + var next, fail, done; + + if (typeof handlers === 'function') { + done = handlers; + } else if (handlers !== null && handlers !== undefined) { + next = handlers.next; + fail = handlers.fail; + done = handlers.done; + } + + sequences[str] = new Sequence(str, next, fail, done); + }; + + cheet.disable = function disable (str) { + delete sequences[str]; + }; + + function keydown (e) { + var id, + k = e ? e.keyCode : event.keyCode; + + if (held[k]) return; + held[k] = true; + + for (id in sequences) { + sequences[id].keydown(k); + } + } + + function keyup (e) { + var k = e ? e.keyCode : event.keyCode; + held[k] = false; + } + + function resetHeldKeys (e) { + var k; + for (k in held) { + held[k] = false; + } + } + + function on (obj, type, fn) { + if (obj.addEventListener) { + obj.addEventListener(type, fn, false); + } else if (obj.attachEvent) { + obj['e' + type + fn] = fn; + obj[type + fn] = function () { + obj['e' + type + fn](window.event); + }; + obj.attachEvent('on' + type, obj[type + fn]); + } + } + + on(window, 'keydown', keydown); + on(window, 'keyup', keyup); + on(window, 'blur', resetHeldKeys); + on(window, 'focus', resetHeldKeys); + + cheet.__next = NOOP; + cheet.next = function next (fn) { + cheet.__next = fn === null ? NOOP : fn; + }; + + cheet.__fail = NOOP; + cheet.fail = function fail (fn) { + cheet.__fail = fn === null ? NOOP : fn; + }; + + cheet.__done = NOOP; + cheet.done = function done (fn) { + cheet.__done = fn === null ? NOOP : fn; + }; + + cheet.reset = function reset (id) { + var seq = sequences[id]; + if (!(seq instanceof Sequence)) { + console.warn('cheet: Unknown sequence: ' + id); + return; + } + + seq.reset(); + }; + + global.cheet = cheet; + + if (typeof define === 'function' && define.amd) { + define([], function () { return cheet; }); + } else if (typeof module !== 'undefined' && module !== null) { + module.exports = cheet; + } + +})(this); From 2aea87d305f834f8b1d6e4ab7fe14398a8ef819f Mon Sep 17 00:00:00 2001 From: nilsding Date: Sun, 21 Dec 2014 22:41:14 +0100 Subject: [PATCH 32/53] Meymeys --- app/assets/javascripts/memes.coffee | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/assets/javascripts/memes.coffee b/app/assets/javascripts/memes.coffee index 6f01e963..873d34d0 100644 --- a/app/assets/javascripts/memes.coffee +++ b/app/assets/javascripts/memes.coffee @@ -1,5 +1,3 @@ -memes = 'up up down down left right left right b a' -cheet memes, -> - cheet.disable memes +cheet 'up up down down left right left right b a', -> ($ "body").addClass 'fa-spin' ($ "p.answerbox--question-text").each (i) -> ($ this).html ":^)" \ No newline at end of file From 23af34494e223b6c5f0bd150f8d90818c5996442 Mon Sep 17 00:00:00 2001 From: Andreas N Date: Sun, 21 Dec 2014 23:01:21 +0100 Subject: [PATCH 33/53] add share on Twitter button --- app/views/inbox/show.html.haml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/inbox/show.html.haml b/app/views/inbox/show.html.haml index afce224b..8b948093 100644 --- a/app/views/inbox/show.html.haml +++ b/app/views/inbox/show.html.haml @@ -6,6 +6,8 @@ %h3.panel-title Out of questions? .panel-body %button.btn.btn-block.btn-info{type: :button, id: 'ib-generate-question'} Get new question + %br + %a.btn.btn-block.btn-primary{href: "https://twitter.com/intent/tweet?text=Ask%20me%20anything?url=#{show_user_profile_path(@user.screen_name)}"} Share on Twitter .panel.panel-default.warning--panel .panel-heading %h3.panel-title Actions From 6201b7043b54e645dd882df5af6dc2b7412562ea Mon Sep 17 00:00:00 2001 From: Andreas N Date: Sun, 21 Dec 2014 23:05:53 +0100 Subject: [PATCH 34/53] how to stupid fix --- app/views/inbox/show.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/inbox/show.html.haml b/app/views/inbox/show.html.haml index 616900d2..0caac770 100644 --- a/app/views/inbox/show.html.haml +++ b/app/views/inbox/show.html.haml @@ -7,7 +7,7 @@ .panel-body %button.btn.btn-block.btn-info{type: :button, id: 'ib-generate-question'} Get new question %br - %a.btn.btn-block.btn-primary{href: "https://twitter.com/intent/tweet?text=Ask%20me%20anything?url=#{show_user_profile_path(@user.screen_name)}"} Share on Twitter + %a.btn.btn-block.btn-primary{href: "https://twitter.com/intent/tweet?text=Ask%20me%20anything?url=#{show_user_profile_path(current_user.screen_name)}"} Share on Twitter .panel.panel-default.warning--panel .panel-heading %h3.panel-title Actions From 40b0097149da34cca56ce8692a852adecc4e32a8 Mon Sep 17 00:00:00 2001 From: Andreas N Date: Sun, 21 Dec 2014 23:07:01 +0100 Subject: [PATCH 35/53] more fix --- app/views/inbox/show.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/inbox/show.html.haml b/app/views/inbox/show.html.haml index 0caac770..924df601 100644 --- a/app/views/inbox/show.html.haml +++ b/app/views/inbox/show.html.haml @@ -7,7 +7,7 @@ .panel-body %button.btn.btn-block.btn-info{type: :button, id: 'ib-generate-question'} Get new question %br - %a.btn.btn-block.btn-primary{href: "https://twitter.com/intent/tweet?text=Ask%20me%20anything?url=#{show_user_profile_path(current_user.screen_name)}"} Share on Twitter + %a.btn.btn-block.btn-primary{href: "https://twitter.com/intent/tweet?text=Ask%20me%20anything?url=#{show_user_profile_url(current_user.screen_name)}"} Share on Twitter .panel.panel-default.warning--panel .panel-heading %h3.panel-title Actions From 98e9fe098fdc80e76578392d01d10259b2676797 Mon Sep 17 00:00:00 2001 From: nilsding Date: Sun, 21 Dec 2014 23:07:56 +0100 Subject: [PATCH 36/53] Meymeys --- app/views/inbox/show.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/inbox/show.html.haml b/app/views/inbox/show.html.haml index 924df601..29ca2b20 100644 --- a/app/views/inbox/show.html.haml +++ b/app/views/inbox/show.html.haml @@ -7,7 +7,7 @@ .panel-body %button.btn.btn-block.btn-info{type: :button, id: 'ib-generate-question'} Get new question %br - %a.btn.btn-block.btn-primary{href: "https://twitter.com/intent/tweet?text=Ask%20me%20anything?url=#{show_user_profile_url(current_user.screen_name)}"} Share on Twitter + %a.btn.btn-block.btn-primary{href: "https://twitter.com/intent/tweet?text=Ask%20me%20anything&url=#{show_user_profile_url(current_user.screen_name)}"} Share on Twitter .panel.panel-default.warning--panel .panel-heading %h3.panel-title Actions From 7429aca0440b62915535f100d58b9528ea20bc2a Mon Sep 17 00:00:00 2001 From: Andreas N Date: Sun, 21 Dec 2014 23:09:16 +0100 Subject: [PATCH 37/53] remove br --- app/views/inbox/show.html.haml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/views/inbox/show.html.haml b/app/views/inbox/show.html.haml index 29ca2b20..47f39c65 100644 --- a/app/views/inbox/show.html.haml +++ b/app/views/inbox/show.html.haml @@ -6,8 +6,7 @@ %h3.panel-title Out of questions? .panel-body %button.btn.btn-block.btn-info{type: :button, id: 'ib-generate-question'} Get new question - %br - %a.btn.btn-block.btn-primary{href: "https://twitter.com/intent/tweet?text=Ask%20me%20anything&url=#{show_user_profile_url(current_user.screen_name)}"} Share on Twitter + %a.btn.btn-block.btn-primary{href: "https://twitter.com/intent/tweet?text=Ask%20me%20anything%21&url=#{show_user_profile_url(current_user.screen_name)}"} Share on Twitter .panel.panel-default.warning--panel .panel-heading %h3.panel-title Actions From 22838ebfda36ca2afbddcf5678f657d05f3bc4b3 Mon Sep 17 00:00:00 2001 From: nilsding Date: Sun, 21 Dec 2014 23:10:26 +0100 Subject: [PATCH 38/53] Meymeys --- app/views/inbox/show.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/inbox/show.html.haml b/app/views/inbox/show.html.haml index 47f39c65..2838789d 100644 --- a/app/views/inbox/show.html.haml +++ b/app/views/inbox/show.html.haml @@ -6,7 +6,7 @@ %h3.panel-title Out of questions? .panel-body %button.btn.btn-block.btn-info{type: :button, id: 'ib-generate-question'} Get new question - %a.btn.btn-block.btn-primary{href: "https://twitter.com/intent/tweet?text=Ask%20me%20anything%21&url=#{show_user_profile_url(current_user.screen_name)}"} Share on Twitter + %a.btn.btn-block.btn-primary{target: '_blank', href: "https://twitter.com/intent/tweet?text=Ask%20me%20anything%21&url=#{show_user_profile_url(current_user.screen_name)}"} Share on Twitter .panel.panel-default.warning--panel .panel-heading %h3.panel-title Actions From a67acf4097330f628d03ff8677303b90614ce640 Mon Sep 17 00:00:00 2001 From: nilsding Date: Sun, 21 Dec 2014 23:18:36 +0100 Subject: [PATCH 39/53] added iconses!!! --- public/apple-touch-icon.png | Bin 0 -> 8804 bytes public/favicon.ico | Bin 0 -> 1150 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 public/apple-touch-icon.png diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7d16acd55906a716aef85c74b30161594870ad7b GIT binary patch literal 8804 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 aG%GMMIxsN$mpOs}0000m1^+=isA>v zQbApb;+IwzisCQSyr#{kjZL&^w2eiLX>B>)GwF;$5Tp|ByKnB?bLPBz??kC-@~f;= z@~l?7rzyd8Tidf4s+1r8c#zmTonDRRFjNWtWFmQV>ave>WD30K3>^_RQC`N~p z=ogMc`X!QQ*TSP7o>|r-)-K+%T+VI4@QVv5X5XQ^sTzY1LKy#%N9xi>WNz$4{KSgC z)Y%bj3z2I-qV4C%2dz1IW(~#*L&)6Rg>Q*=WbgVW>+pLvOncIKo8smq%{%@N-W-8a)muK8`FpX2B`x>#!G*m>qGXblpJ9bbx`<|VdAR-14q xPOe1y+BU5(>~rj0u=6YW^$ZJ-#W7|~I5;Pre#g%5|K1;S52t#6&Hunu{V)8qi46b% literal 0 HcmV?d00001 From a09c01cc4483102817eaf4cc18588f9148d2f1e5 Mon Sep 17 00:00:00 2001 From: Andreas N Date: Thu, 25 Dec 2014 14:22:49 +0100 Subject: [PATCH 40/53] fixed text display for anon questionbox --- app/views/shared/_questionbox.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shared/_questionbox.html.haml b/app/views/shared/_questionbox.html.haml index dfaff539..e9d066b7 100644 --- a/app/views/shared/_questionbox.html.haml +++ b/app/views/shared/_questionbox.html.haml @@ -23,7 +23,7 @@ - unless user_signed_in? #question-box-promote.row{:style => "display: none;"} .row - .col-xs-12 + .col-xs-12.text-center %strong Your question has been sent. .row .col-sm-1 From 4f777968e529ee4259c9b4f36be931175dfada8a Mon Sep 17 00:00:00 2001 From: Andreas N Date: Thu, 25 Dec 2014 14:26:35 +0100 Subject: [PATCH 41/53] readded links to questions on user profile --- app/views/shared/_answerbox.html.haml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/views/shared/_answerbox.html.haml b/app/views/shared/_answerbox.html.haml index 791f7e7f..54bcfcae 100644 --- a/app/views/shared/_answerbox.html.haml +++ b/app/views/shared/_answerbox.html.haml @@ -8,9 +8,15 @@ .media-body %h6.text-muted.media-heading.answerbox--question-user = user_screen_name a.question.user, a.question.author_is_anonymous - asked - = time_ago_in_words(a.question.created_at) - ago + - if @user.nil? + asked + = time_ago_in_words(a.question.created_at) + ago + - else + asked + %a{href: show_user_question_path(a.question.user.screen_name, a.question.id)} + = time_ago_in_words(a.question.created_at) + ago - unless a.question.author_is_anonymous - if a.question.answer_count > 1 · From de1ef57a8af258201ad4d7782cc6e4568d26d493 Mon Sep 17 00:00:00 2001 From: nilsding Date: Thu, 25 Dec 2014 15:13:52 +0100 Subject: [PATCH 42/53] dose that work --- app/views/shared/_answerbox.html.haml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/views/shared/_answerbox.html.haml b/app/views/shared/_answerbox.html.haml index 54bcfcae..09a72c83 100644 --- a/app/views/shared/_answerbox.html.haml +++ b/app/views/shared/_answerbox.html.haml @@ -8,15 +8,13 @@ .media-body %h6.text-muted.media-heading.answerbox--question-user = user_screen_name a.question.user, a.question.author_is_anonymous - - if @user.nil? - asked + asked + - if @user.nil? and a.question.author_is_anonymous = time_ago_in_words(a.question.created_at) - ago - else - asked %a{href: show_user_question_path(a.question.user.screen_name, a.question.id)} = time_ago_in_words(a.question.created_at) - ago + ago - unless a.question.author_is_anonymous - if a.question.answer_count > 1 · From 4e2cfd5188b17ac598abfb60003dcbe9d9a3a3cc Mon Sep 17 00:00:00 2001 From: nilsding Date: Thu, 25 Dec 2014 15:16:10 +0100 Subject: [PATCH 43/53] ??? --- app/views/shared/_answerbox.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shared/_answerbox.html.haml b/app/views/shared/_answerbox.html.haml index 09a72c83..8673f2ce 100644 --- a/app/views/shared/_answerbox.html.haml +++ b/app/views/shared/_answerbox.html.haml @@ -9,7 +9,7 @@ %h6.text-muted.media-heading.answerbox--question-user = user_screen_name a.question.user, a.question.author_is_anonymous asked - - if @user.nil? and a.question.author_is_anonymous + - if @user.nil? and a.question.author_is_anonymous and !a.question.user.nil? = time_ago_in_words(a.question.created_at) - else %a{href: show_user_question_path(a.question.user.screen_name, a.question.id)} From b927b3bc87f4e74030dbde62ccda83d250601a70 Mon Sep 17 00:00:00 2001 From: nilsding Date: Thu, 25 Dec 2014 15:16:57 +0100 Subject: [PATCH 44/53] orrrr --- app/views/shared/_answerbox.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shared/_answerbox.html.haml b/app/views/shared/_answerbox.html.haml index 8673f2ce..f703c030 100644 --- a/app/views/shared/_answerbox.html.haml +++ b/app/views/shared/_answerbox.html.haml @@ -9,7 +9,7 @@ %h6.text-muted.media-heading.answerbox--question-user = user_screen_name a.question.user, a.question.author_is_anonymous asked - - if @user.nil? and a.question.author_is_anonymous and !a.question.user.nil? + - if @user.nil? or a.question.author_is_anonymous = time_ago_in_words(a.question.created_at) - else %a{href: show_user_question_path(a.question.user.screen_name, a.question.id)} From e900b794d3969ee4956d85568b5e2efc471f2370 Mon Sep 17 00:00:00 2001 From: pixeldesu Date: Fri, 26 Dec 2014 13:45:29 +0100 Subject: [PATCH 45/53] increased sidebar size on profile --- app/views/user/show.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/user/show.html.haml b/app/views/user/show.html.haml index 1e6e72eb..ff2c55be 100644 --- a/app/views/user/show.html.haml +++ b/app/views/user/show.html.haml @@ -1,9 +1,9 @@ .profile--header .container.j2-page - .col-md-3.col-xs-12.col-sm-3 + .col-md-4.col-xs-12.col-sm-4 = render 'user/profile_info' .hidden-xs= render 'shared/links' - .col-md-9.col-xs-12.col-sm-9 + .col-md-8.col-xs-12.col-sm-8 = render 'shared/questionbox' #answers - @answers.each do |a| From 40dc6a140d821d1c271addb41f7c6d7f0c97deed Mon Sep 17 00:00:00 2001 From: pixeldesu Date: Fri, 26 Dec 2014 13:48:20 +0100 Subject: [PATCH 46/53] fix margin if content is empty --- app/assets/stylesheets/scss/user.scss | 4 ++++ app/views/user/_actions.html.haml | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/scss/user.scss b/app/assets/stylesheets/scss/user.scss index 896a8f4b..1c04aa9b 100644 --- a/app/assets/stylesheets/scss/user.scss +++ b/app/assets/stylesheets/scss/user.scss @@ -58,4 +58,8 @@ border-bottom: 2px solid $brand-danger; background-color: #fff; text-transform: uppercase; +} + +.profile--follow-btn { + margin-top: 5px; } \ No newline at end of file diff --git a/app/views/user/_actions.html.haml b/app/views/user/_actions.html.haml index 7a6b277d..730c1e1d 100644 --- a/app/views/user/_actions.html.haml +++ b/app/views/user/_actions.html.haml @@ -1,11 +1,11 @@ - if user_signed_in? - type ||= :nil - if user == current_user - %a.btn.btn-default.btn-block{href: edit_user_profile_path} Edit profile + %a.btn.btn-default.btn-block.profile--follow-btn{href: edit_user_profile_path} Edit profile - else - if current_user.following? user - %button#editprofile.btn.btn-default.btn-block{type: :button, name: 'user-action', data: { action: :unfollow, type: type, target: user.screen_name }} + %button#editprofile.btn.btn-default.btn-block.profile--follow-btn{type: :button, name: 'user-action', data: { action: :unfollow, type: type, target: user.screen_name }} Unfollow - else - %button#editprofile.btn.btn-primary.btn-block{type: :button, name: 'user-action', data: { action: :follow, type: type, target: user.screen_name }} + %button#editprofile.btn.btn-primary.btn-block.profile--follow-btn{type: :button, name: 'user-action', data: { action: :follow, type: type, target: user.screen_name }} Follow \ No newline at end of file From da8e76edb0fb7ec568406e1902895daa77d94cac Mon Sep 17 00:00:00 2001 From: nilsding Date: Fri, 26 Dec 2014 15:28:53 +0100 Subject: [PATCH 47/53] added follow user spec --- spec/features/users/follow_user_spec.rb | 28 +++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 spec/features/users/follow_user_spec.rb diff --git a/spec/features/users/follow_user_spec.rb b/spec/features/users/follow_user_spec.rb new file mode 100644 index 00000000..3d03347f --- /dev/null +++ b/spec/features/users/follow_user_spec.rb @@ -0,0 +1,28 @@ +include Warden::Test::Helpers +Warden.test_mode! + +feature "User profile page", :devise do + + after :each do + Warden.test_reset! + end + + scenario "user gets followed", js: true do + me = FactoryGirl.create(:user) + other = FactoryGirl.create(:user) + + login_as me, scope: :user + visit show_user_profile_path(other.screen_name) + page.driver.render Rails.root.join("tmp/#{Time.now.to_i}_1.png"), full: true + + click_button "Follow" + wait_for_ajax + page.driver.render Rails.root.join("tmp/#{Time.now.to_i}_2.png"), full: true + + expect(page).to have_text("FOLLOWING") + + click_link 'Followers' + page.driver.render Rails.root.join("tmp/#{Time.now.to_i}_3.png"), full: true + expect(page).to have_text(me.screen_name) + end +end From 32ace00f8428cf95618fbf8e02341c643066e88e Mon Sep 17 00:00:00 2001 From: pixeldesu Date: Fri, 26 Dec 2014 15:32:53 +0100 Subject: [PATCH 48/53] forgot the extra profile pages --- app/views/user/questions.html.haml | 4 ++-- app/views/user/show_follow.html.haml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/user/questions.html.haml b/app/views/user/questions.html.haml index b70324e7..b271b69a 100644 --- a/app/views/user/questions.html.haml +++ b/app/views/user/questions.html.haml @@ -1,9 +1,9 @@ .profile--header .container.j2-page - .col-md-3.col-xs-12.col-sm-3 + .col-md-4.col-xs-12.col-sm-4 = render 'user/profile_info' .hidden-xs= render 'shared/links' - .col-md-9.col-xs-12.col-sm-9 + .col-md-8.col-xs-12.col-sm-8 %h1.j2-lh.hidden-xs= @title %h1.visible-xs= @title #questions diff --git a/app/views/user/show_follow.html.haml b/app/views/user/show_follow.html.haml index c7c0cdea..04bd7f2d 100644 --- a/app/views/user/show_follow.html.haml +++ b/app/views/user/show_follow.html.haml @@ -1,9 +1,9 @@ .profile--header .container.j2-page - .col-md-3.col-xs-12.col-sm-3 + .col-md-4.col-xs-12.col-sm-4 = render 'user/profile_info' .hidden-xs= render 'shared/links' - .col-md-9.col-xs-12.col-sm-9 + .col-md-8.col-xs-12.col-sm-8 %h1.j2-lh.hidden-xs= @title %h1.visible-xs= @title #users From 4961a44d59e4340dcff8260996d1966cb5127814 Mon Sep 17 00:00:00 2001 From: Andreas N Date: Sat, 27 Dec 2014 00:33:45 +0100 Subject: [PATCH 49/53] add collapsed view for single answerbox --- app/views/shared/_answerbox.html.haml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/views/shared/_answerbox.html.haml b/app/views/shared/_answerbox.html.haml index f703c030..2a613203 100644 --- a/app/views/shared/_answerbox.html.haml +++ b/app/views/shared/_answerbox.html.haml @@ -49,6 +49,11 @@ .row .col-md-6.col-md-offset-6.col-sm-8.col-sm-offset-4.col-xs-6.col-xs-offset-6.text-right = render 'shared/answerbox_buttons', a: a - .panel-footer{id: "ab-comments-section-#{a.id}", style: 'display: none'} - %div{id: "ab-smiles-#{a.id}"}= render 'shared/smiles', a: a - %div{id: "ab-comments-#{a.id}"}= render 'shared/comments', a: a + -if @display_all.nil? + .panel-footer{id: "ab-comments-section-#{a.id}", style: 'display: none'} + %div{id: "ab-smiles-#{a.id}"}= render 'shared/smiles', a: a + %div{id: "ab-comments-#{a.id}"}= render 'shared/comments', a: a + - else + .panel-footer{id: "ab-comments-section-#{a.id}"} + %div{id: "ab-smiles-#{a.id}"}= render 'shared/smiles', a: a + %div{id: "ab-comments-#{a.id}"}= render 'shared/comments', a: a \ No newline at end of file From 20c173442d4fb96898cbd15ead20475cf2a18bbf Mon Sep 17 00:00:00 2001 From: Andreas N Date: Sat, 27 Dec 2014 00:37:42 +0100 Subject: [PATCH 50/53] remove that button --- app/views/shared/_answerbox.html.haml | 2 +- app/views/shared/_answerbox_buttons.html.haml | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/views/shared/_answerbox.html.haml b/app/views/shared/_answerbox.html.haml index 2a613203..a09db5bd 100644 --- a/app/views/shared/_answerbox.html.haml +++ b/app/views/shared/_answerbox.html.haml @@ -49,7 +49,7 @@ .row .col-md-6.col-md-offset-6.col-sm-8.col-sm-offset-4.col-xs-6.col-xs-offset-6.text-right = render 'shared/answerbox_buttons', a: a - -if @display_all.nil? + - if @display_all.nil? .panel-footer{id: "ab-comments-section-#{a.id}", style: 'display: none'} %div{id: "ab-smiles-#{a.id}"}= render 'shared/smiles', a: a %div{id: "ab-comments-#{a.id}"}= render 'shared/comments', a: a diff --git a/app/views/shared/_answerbox_buttons.html.haml b/app/views/shared/_answerbox_buttons.html.haml index d2b05016..924036ae 100644 --- a/app/views/shared/_answerbox_buttons.html.haml +++ b/app/views/shared/_answerbox_buttons.html.haml @@ -12,9 +12,10 @@ %button.btn.btn-info.btn-sm{type: :button, name: 'ab-smile', data: { a_id: a.id, action: :smile }} %i.fa.fa-smile-o %span{id: "ab-smile-count-#{a.id}"}= a.smile_count -%button.btn.btn-primary.btn-sm{type: :button, name: 'ab-comments', data: { a_id: a.id, state: :hidden }} - %i.fa.fa-comments - %span{id: "ab-comment-count-#{a.id}"}= a.comment_count +- unless @display_all + %button.btn.btn-primary.btn-sm{type: :button, name: 'ab-comments', data: { a_id: a.id, state: :hidden }} + %i.fa.fa-comments + %span{id: "ab-comment-count-#{a.id}"}= a.comment_count - if privileged? a.user %button.btn.btn-danger.btn-sm{name: 'ab-destroy', data: { a_id: a.id }} %i.fa.fa-trash-o \ No newline at end of file From c817f32b1831ab4bec03ff845cf2dfb16efd708a Mon Sep 17 00:00:00 2001 From: nilsding Date: Sat, 27 Dec 2014 00:39:03 +0100 Subject: [PATCH 51/53] j --- app/views/shared/_answerbox.html.haml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/app/views/shared/_answerbox.html.haml b/app/views/shared/_answerbox.html.haml index 2a613203..8a53cdaa 100644 --- a/app/views/shared/_answerbox.html.haml +++ b/app/views/shared/_answerbox.html.haml @@ -49,11 +49,6 @@ .row .col-md-6.col-md-offset-6.col-sm-8.col-sm-offset-4.col-xs-6.col-xs-offset-6.text-right = render 'shared/answerbox_buttons', a: a - -if @display_all.nil? - .panel-footer{id: "ab-comments-section-#{a.id}", style: 'display: none'} - %div{id: "ab-smiles-#{a.id}"}= render 'shared/smiles', a: a - %div{id: "ab-comments-#{a.id}"}= render 'shared/comments', a: a - - else - .panel-footer{id: "ab-comments-section-#{a.id}"} - %div{id: "ab-smiles-#{a.id}"}= render 'shared/smiles', a: a - %div{id: "ab-comments-#{a.id}"}= render 'shared/comments', a: a \ No newline at end of file + .panel-footer{id: "ab-comments-section-#{a.id}", style: @display_all.nil? ? 'display: none' : nil } + %div{id: "ab-smiles-#{a.id}"}= render 'shared/smiles', a: a + %div{id: "ab-comments-#{a.id}"}= render 'shared/comments', a: a \ No newline at end of file From 88e9d7599df316c6e5e1de8b50ca3e8242dcd60c Mon Sep 17 00:00:00 2001 From: nilsding Date: Sat, 27 Dec 2014 01:22:13 +0100 Subject: [PATCH 52/53] dragons --- app/models/user.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/models/user.rb b/app/models/user.rb index b89dddcd..c202d696 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -33,6 +33,14 @@ class User < ActiveRecord::Base # validates :website, format: { with: WEBSITE_REGEX } + before_save do + self.website = if website.match %r{\Ahttps?://} + website + else + "http://#{website}" + end unless website.blank? + end + def login=(login) @login = login end From e570f40a362103e4556a6b11d31b27592a5d201a Mon Sep 17 00:00:00 2001 From: nilsding Date: Sat, 27 Dec 2014 01:45:24 +0100 Subject: [PATCH 53/53] WRYYYYYYYYYYYYYYYYYY --- app/models/user.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/user.rb b/app/models/user.rb index c202d696..45b3626a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -34,6 +34,7 @@ class User < ActiveRecord::Base # validates :website, format: { with: WEBSITE_REGEX } before_save do + self.display_name = 'WRYYYYYYYY' if display_name == 'Dio Brando' self.website = if website.match %r{\Ahttps?://} website else