From 2622ded0a0f4e8cd60020c5e2e9e76b59771c387 Mon Sep 17 00:00:00 2001 From: Andreas Nedbal Date: Sun, 10 May 2020 13:37:08 +0200 Subject: [PATCH] Fix lints in app/views/discover --- app/views/discover/_tab_answers.haml | 3 ++ app/views/discover/_tab_answers.html.haml | 3 -- app/views/discover/_tab_asked.haml | 3 ++ app/views/discover/_tab_asked.html.haml | 3 -- ...iscussed.html.haml => _tab_discussed.haml} | 2 +- app/views/discover/_tab_most.haml | 3 ++ app/views/discover/_tab_most.html.haml | 3 -- app/views/discover/_tab_new.haml | 3 ++ app/views/discover/_tab_new.html.haml | 3 -- app/views/discover/_tab_questions.haml | 3 ++ app/views/discover/_tab_questions.html.haml | 3 -- .../{_userbox.html.haml => _userbox.haml} | 20 +++++----- app/views/discover/index.haml | 40 +++++++++++++++++++ app/views/discover/index.html.haml | 39 ------------------ 14 files changed, 66 insertions(+), 65 deletions(-) create mode 100644 app/views/discover/_tab_answers.haml delete mode 100644 app/views/discover/_tab_answers.html.haml create mode 100644 app/views/discover/_tab_asked.haml delete mode 100644 app/views/discover/_tab_asked.html.haml rename app/views/discover/{_tab_discussed.html.haml => _tab_discussed.haml} (52%) create mode 100644 app/views/discover/_tab_most.haml delete mode 100644 app/views/discover/_tab_most.html.haml create mode 100644 app/views/discover/_tab_new.haml delete mode 100644 app/views/discover/_tab_new.html.haml create mode 100644 app/views/discover/_tab_questions.haml delete mode 100644 app/views/discover/_tab_questions.html.haml rename app/views/discover/{_userbox.html.haml => _userbox.haml} (52%) create mode 100644 app/views/discover/index.haml delete mode 100644 app/views/discover/index.html.haml diff --git a/app/views/discover/_tab_answers.haml b/app/views/discover/_tab_answers.haml new file mode 100644 index 00000000..c09f4ce5 --- /dev/null +++ b/app/views/discover/_tab_answers.haml @@ -0,0 +1,3 @@ +.tab-pane.active.fade.show{ role: 'tabpanel', id: 'answers' } + - answers.each do |a| + = render 'answerbox', a: a diff --git a/app/views/discover/_tab_answers.html.haml b/app/views/discover/_tab_answers.html.haml deleted file mode 100644 index 0738798d..00000000 --- a/app/views/discover/_tab_answers.html.haml +++ /dev/null @@ -1,3 +0,0 @@ -.tab-pane.active.fade.show{role: "tabpanel", id: "answers"} - - answers.each do |a| - = render 'answerbox', a: a diff --git a/app/views/discover/_tab_asked.haml b/app/views/discover/_tab_asked.haml new file mode 100644 index 00000000..1728145a --- /dev/null +++ b/app/views/discover/_tab_asked.haml @@ -0,0 +1,3 @@ +.tab-pane.fade{ role: 'tabpanel', id: 'asked' } + - asked.each do |user| + = render 'discover/userbox', u: user.user, type: 'asked', q: user.question_count diff --git a/app/views/discover/_tab_asked.html.haml b/app/views/discover/_tab_asked.html.haml deleted file mode 100644 index 95136d6c..00000000 --- a/app/views/discover/_tab_asked.html.haml +++ /dev/null @@ -1,3 +0,0 @@ -.tab-pane.fade{role: "tabpanel", id: "asked"} - - asked.each do |user| - = render 'discover/userbox', u: user.user, type: "asked", q: user.question_count diff --git a/app/views/discover/_tab_discussed.html.haml b/app/views/discover/_tab_discussed.haml similarity index 52% rename from app/views/discover/_tab_discussed.html.haml rename to app/views/discover/_tab_discussed.haml index 1dafe7ce..cc06cc81 100644 --- a/app/views/discover/_tab_discussed.html.haml +++ b/app/views/discover/_tab_discussed.haml @@ -1,3 +1,3 @@ -.tab-pane.fade{role: "tabpanel", id: "comments"} +.tab-pane.fade{ role: 'tabpanel', id: 'comments' } - comments.each do |a| = render 'answerbox', a: a diff --git a/app/views/discover/_tab_most.haml b/app/views/discover/_tab_most.haml new file mode 100644 index 00000000..4824abfd --- /dev/null +++ b/app/views/discover/_tab_most.haml @@ -0,0 +1,3 @@ +.tab-pane.fade{ role: 'tabpanel', id: 'answered' } + - answered.each do |user| + = render 'discover/userbox', u: user.user, type: 'most', a: user.answer_count diff --git a/app/views/discover/_tab_most.html.haml b/app/views/discover/_tab_most.html.haml deleted file mode 100644 index 3b9a1645..00000000 --- a/app/views/discover/_tab_most.html.haml +++ /dev/null @@ -1,3 +0,0 @@ -.tab-pane.fade{role: "tabpanel", id: "answered"} - - answered.each do |user| - = render 'discover/userbox', u: user.user, type: "most", a: user.answer_count diff --git a/app/views/discover/_tab_new.haml b/app/views/discover/_tab_new.haml new file mode 100644 index 00000000..604fa14f --- /dev/null +++ b/app/views/discover/_tab_new.haml @@ -0,0 +1,3 @@ +.tab-pane.active.fade.show{ role: 'tabpanel', id: 'new' } + - new.each do |user| + = render 'discover/userbox', u: user, type: 'new' diff --git a/app/views/discover/_tab_new.html.haml b/app/views/discover/_tab_new.html.haml deleted file mode 100644 index 016a9612..00000000 --- a/app/views/discover/_tab_new.html.haml +++ /dev/null @@ -1,3 +0,0 @@ -.tab-pane.active.fade.show{role: "tabpanel", id: "new"} - - new.each do |user| - = render 'discover/userbox', u: user, type: "new" diff --git a/app/views/discover/_tab_questions.haml b/app/views/discover/_tab_questions.haml new file mode 100644 index 00000000..f515943e --- /dev/null +++ b/app/views/discover/_tab_questions.haml @@ -0,0 +1,3 @@ +.tab-pane.fade{ role: 'tabpanel', id: 'questions' } + - questions.each do |q| + = render 'shared/question', q: q, type: 'discover' diff --git a/app/views/discover/_tab_questions.html.haml b/app/views/discover/_tab_questions.html.haml deleted file mode 100644 index cd14a840..00000000 --- a/app/views/discover/_tab_questions.html.haml +++ /dev/null @@ -1,3 +0,0 @@ -.tab-pane.fade{role: "tabpanel", id: "questions"} - - questions.each do |q| - = render 'shared/question', q: q, type: "discover" diff --git a/app/views/discover/_userbox.html.haml b/app/views/discover/_userbox.haml similarity index 52% rename from app/views/discover/_userbox.html.haml rename to app/views/discover/_userbox.haml index c1d5cf9b..b087ca2f 100644 --- a/app/views/discover/_userbox.html.haml +++ b/app/views/discover/_userbox.haml @@ -1,22 +1,22 @@ -.card{data: { id: u.id }} +.card{ data: { id: u.id } } .card-body .media .pull-left - %a{href: show_user_profile_path(u.screen_name)} - %img.avatar-md.mr-2{src: u.profile_picture.url(:medium)} + %a{ href: show_user_profile_path(u.screen_name) } + %img.avatar-md.mr-2{ src: u.profile_picture.url(:medium) } .media-body %h6.media-heading.answerbox__question-user - if u.display_name.blank? - %a{href: show_user_profile_path(u.screen_name)} - %span= "@#{u.screen_name}" + %a{ href: show_user_profile_path(u.screen_name) } + = u.screen_name - else - %a{href: show_user_profile_path(u.screen_name)} - %span= u.display_name - %span.text-muted= "@#{u.screen_name}" + %a{ href: show_user_profile_path(u.screen_name) } + = u.display_name + %span.text-muted= u.screen_name %p.answerbox__question-text - - if type == "new" + - if type == 'new' = t('views.discover.userbox.new', time: time_ago_in_words(u.created_at)) - - elsif type == "most" + - elsif type == 'most' = t('views.discover.userbox.answers', questions: pluralize(a, t('views.general.question'))) - else = t('views.discover.userbox.questions', questions: pluralize(q, t('views.general.question'))) diff --git a/app/views/discover/index.haml b/app/views/discover/index.haml new file mode 100644 index 00000000..fd5183c3 --- /dev/null +++ b/app/views/discover/index.haml @@ -0,0 +1,40 @@ +- provide(:title, generate_title('Discover')) + +.jumbotron.jumbotron--particles + .jumbotron__particles#particles + .jumbotron__content + %h1= t 'views.discover.title' + %p= t('views.discover.subtitle', app_title: APP_CONFIG['site_name']) +.container + .row + .col-md-7.col-sm-6 + %h2= t 'views.discover.content.title' + %p= t 'views.discover.content.desc' + %div{ role: 'tabpanel' } + %ul.nav.nav-tabs{ role: 'tablist' } + %li.nav-item{ role: 'presentation' } + %a.nav-link.active{ href: '#answers', role: 'tab', aria: { controls: 'answers' }, data: { toggle: 'tab' } }= t 'views.discover.content.tab.answers' + %li.nav-item{ role: 'presentation' } + %a.nav-link{ href: '#questions', role: 'tab', aria: { controls: 'questions' }, data: { toggle: 'tab' } }= t 'views.discover.content.tab.questions' + %li.nav-item{ role: 'presentation' } + %a.nav-link{ href: '#comments', role: 'tab', aria: { controls: 'comments' }, data: { toggle: 'tab' } }= t 'views.discover.content.tab.comments' + .tab-content.mt-3 + = render 'discover/tab_answers', answers: @popular_answers + = render 'discover/tab_questions', questions: @popular_questions + = render 'discover/tab_discussed', comments: @most_discussed + .col-md-5.col-sm-6 + %h2= t 'views.discover.people.title' + %p= t 'views.discover.people.desc' + %div{ role: 'tabpanel' } + %ul.nav.nav-tabs{ role: 'tablist' } + %li.nav-item{ role: 'presentation' } + %a.nav-link.active{ href: '#new', role: 'tab', aria: { controls: 'new' }, data: { toggle: 'tab' } }= t 'views.discover.people.tab.new' + %li.nav-item{ role: 'presentation' } + %a.nav-link{ href: '#asked', role: 'tab', aria: { controls: 'asked' }, data: { toggle: 'tab' } }= t 'views.discover.people.tab.questions' + %li.nav-item{ role: 'presentation' } + %a.nav-link{ href: '#answered', role: 'tab', aria: { controls: 'answered' }, data: { toggle: 'tab' } }= t 'views.discover.people.tab.answers' + .tab-content.mt-3 + = render 'discover/tab_new', new: @new_users + = render 'discover/tab_asked', asked: @users_with_most_questions + = render 'discover/tab_most', answered: @users_with_most_answers + = render 'shared/links' diff --git a/app/views/discover/index.html.haml b/app/views/discover/index.html.haml deleted file mode 100644 index b20a58b3..00000000 --- a/app/views/discover/index.html.haml +++ /dev/null @@ -1,39 +0,0 @@ -- provide(:title, generate_title("Discover")) -.jumbotron.jumbotron--particles - #particles.jumbotron__particles - .jumbotron__content - %h1= t 'views.discover.title' - %p= t('views.discover.subtitle', app_title: APP_CONFIG['site_name']) -.container - .row - .col-md-7.col-sm-6 - %h2= t 'views.discover.content.title' - %p= t 'views.discover.content.desc' - %div{role: "tabpanel"} - %ul.nav.nav-tabs{role: "tablist"} - %li.nav-item{role: "presentation"} - %a.nav-link.active{href: "#answers", role: "tab", aria: {controls: "answers"}, data: {toggle: "tab"}}= t 'views.discover.content.tab.answers' - %li.nav-item{role: "presentation"} - %a.nav-link{href: "#questions", role: "tab", aria: {controls: "questions"}, data: {toggle: "tab"}}= t 'views.discover.content.tab.questions' - %li.nav-item{role: "presentation"} - %a.nav-link{href: "#comments", role: "tab", aria: {controls: "comments"}, data: {toggle: "tab"}}= t 'views.discover.content.tab.comments' - .tab-content.mt-3 - = render 'discover/tab_answers', answers: @popular_answers - = render 'discover/tab_questions', questions: @popular_questions - = render 'discover/tab_discussed', comments: @most_discussed - .col-md-5.col-sm-6 - %h2= t 'views.discover.people.title' - %p= t 'views.discover.people.desc' - %div{role: "tabpanel"} - %ul.nav.nav-tabs{role: "tablist"} - %li.nav-item{role: "presentation"} - %a.nav-link.active{href: "#new", role: "tab", aria: {controls: "new"}, data: {toggle: "tab"}}= t 'views.discover.people.tab.new' - %li.nav-item{role: "presentation"} - %a.nav-link{href: "#asked", role: "tab", aria: {controls: "asked"}, data: {toggle: "tab"}}= t 'views.discover.people.tab.questions' - %li.nav-item{role: "presentation"} - %a.nav-link{href: "#answered", role: "tab", aria: {controls: "answered"}, data: {toggle: "tab"}}= t 'views.discover.people.tab.answers' - .tab-content.mt-3 - = render 'discover/tab_new', new: @new_users - = render 'discover/tab_asked', asked: @users_with_most_questions - = render 'discover/tab_most', answered: @users_with_most_answers - = render 'shared/links'