about summary refs log tree commit diff
path: root/app/views
diff options
context:
space:
mode:
authorMatt Jankowski <mjankowski@thoughtbot.com>2017-04-19 07:52:37 -0400
committerEugen <eugen@zeonfederated.com>2017-04-19 13:52:37 +0200
commit8bac0350d16cb8e2770c089c91d71f8038404de5 (patch)
treef5b381319fde16fbe393dbae2cba1691f17aea9a /app/views
parentc0b30c56db36d0064ee7618976ab4e25f7a675fd (diff)
Restful refactor of accounts/ routes (#2133)
* Add routing specs for accounts followers and following actions

* Use more restful route naming for public account follow pages

Moves two actions:
- accounts#followers to accounts/follower_accounts#index
- accounts#following to accounts/following_accounts#index

Adds routing spec to ensure prior URLs are preserved.
Diffstat (limited to 'app/views')
-rw-r--r--app/views/accounts/_follow_grid.html.haml7
-rw-r--r--app/views/accounts/_header.html.haml12
-rw-r--r--app/views/follower_accounts/index.html.haml6
-rw-r--r--app/views/following_accounts/index.html.haml6
4 files changed, 25 insertions, 6 deletions
diff --git a/app/views/accounts/_follow_grid.html.haml b/app/views/accounts/_follow_grid.html.haml
new file mode 100644
index 000000000..322a0ebf4
--- /dev/null
+++ b/app/views/accounts/_follow_grid.html.haml
@@ -0,0 +1,7 @@
+.accounts-grid
+  - if accounts.empty?
+    = render partial: 'accounts/nothing_here'
+  - else
+    = render partial: 'accounts/grid_card', collection: accounts, as: :account, cached: true
+
+= paginate accounts
diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml
index 6538885a0..ed13ab57c 100644
--- a/app/views/accounts/_header.html.haml
+++ b/app/views/accounts/_header.html.haml
@@ -2,9 +2,9 @@
   - if user_signed_in? && current_account.id != account.id && !current_account.requested?(account)
     .controls
       - if current_account.following?(account)
-        = link_to t('accounts.unfollow'), unfollow_account_path(account), data: { method: :post }, class: 'button'
+        = link_to t('accounts.unfollow'), account_unfollow_path(account), data: { method: :post }, class: 'button'
       - else
-        = link_to t('accounts.follow'), follow_account_path(account), data: { method: :post }, class: 'button'
+        = link_to t('accounts.follow'), account_follow_path(account), data: { method: :post }, class: 'button'
   - elsif !user_signed_in?
     .controls
       .remote-follow
@@ -24,11 +24,11 @@
         = link_to short_account_url(account), class: 'u-url u-uid' do
           %span.counter-label= t('accounts.posts')
           %span.counter-number= number_with_delimiter account.statuses_count
-      .counter{ class: active_nav_class(following_account_url(account)) }
-        = link_to following_account_url(account) do
+      .counter{ class: active_nav_class(account_following_index_url(account)) }
+        = link_to account_following_index_url(account) do
           %span.counter-label= t('accounts.following')
           %span.counter-number= number_with_delimiter account.following_count
-      .counter{ class: active_nav_class(followers_account_url(account)) }
-        = link_to followers_account_url(account) do
+      .counter{ class: active_nav_class(account_followers_url(account)) }
+        = link_to account_followers_url(account) do
           %span.counter-label= t('accounts.followers')
           %span.counter-number= number_with_delimiter account.followers_count
diff --git a/app/views/follower_accounts/index.html.haml b/app/views/follower_accounts/index.html.haml
new file mode 100644
index 000000000..c30d601e6
--- /dev/null
+++ b/app/views/follower_accounts/index.html.haml
@@ -0,0 +1,6 @@
+- content_for :page_title do
+  = t('accounts.people_who_follow', name: display_name(@account))
+
+= render 'accounts/header', account: @account
+
+= render 'accounts/follow_grid', accounts: @accounts
diff --git a/app/views/following_accounts/index.html.haml b/app/views/following_accounts/index.html.haml
new file mode 100644
index 000000000..cd3737591
--- /dev/null
+++ b/app/views/following_accounts/index.html.haml
@@ -0,0 +1,6 @@
+- content_for :page_title do
+  = t('accounts.people_followed_by', name: display_name(@account))
+
+= render 'accounts/header', account: @account
+
+= render 'accounts/follow_grid', accounts: @accounts