Progress

app/views/accounts/_bio.html.haml

@@ -20,8 +20,6 @@
                 = fa_icon 'check'
             = Formatter.instance.format_field(account, field.value, custom_emojify: true)
 
-  = account_badge(account)
-
   - if account.note.present?
     .account__header__content.emojify= Formatter.instance.simplified_format(account, custom_emojify: true)
 

app/views/admin/accounts/_account.html.haml

@@ -1,8 +1,6 @@
 %tr
   %td
     = admin_account_link_to(account)
-  %td
-    %div{ style: 'margin: -2px 0' }= account_badge(account, all: true)
   %td
     - if account.user_current_sign_in_ip
       %samp.ellipsized-ip{ title: account.user_current_sign_in_ip }= account.user_current_sign_in_ip
@@ -12,4 +10,6 @@
     - if account.user_current_sign_in_at
       %time.time-ago{ datetime: account.user_current_sign_in_at.iso8601, title: l(account.user_current_sign_in_at) }= l account.user_current_sign_in_at
     - else
-      \-
+      \-
+  %td
+    %samp= number_with_delimiter account.statuses.count

app/views/admin/accounts/index.html.haml

@@ -34,9 +34,9 @@
     %thead
       %tr
         %th= t('admin.accounts.username')
-        %th= t('admin.accounts.role')
         %th= t('admin.accounts.most_recent_ip')
         %th= t('admin.accounts.most_recent_activity')
+        %th Status count
         %th
     %tbody
       = render @accounts

app/views/admin/accounts/show.html.haml

@@ -42,6 +42,18 @@
         - else
           %span.neutral= t('admin.accounts.no_limits_imposed')
       .dashboard__counters__label= t 'admin.accounts.login_status'
+  %div
+    = link_to admin_account_joined_groups_path(@account.id) do
+      .dashboard__counters__num= number_with_delimiter @account.groups.count
+      .dashboard__counters__label Joined Groups
+  %div
+    = link_to admin_account_chat_conversations_path(@account.id) do
+      .dashboard__counters__num= number_with_delimiter @account.chat_conversation_accounts_count
+      .dashboard__counters__label Chat Conversations
+  %div
+    = link_to admin_account_chat_messages_path(@account.id) do
+      .dashboard__counters__num= number_with_delimiter @account.chat_messages_count
+      .dashboard__counters__label Chat Messages
 
 - unless @account.local? && @account.user.nil?
   .table-wrapper

app/views/admin/chat_conversations/index.html.haml

@@ -0,0 +1,28 @@
+- content_for :page_title do
+  = t('admin.followers.title', acct: @account.acct)
+
+.filters
+  .filter-subset
+    %strong= t('admin.accounts.location.title')
+    %ul
+      %li= link_to t('admin.accounts.location.local'), admin_account_followers_path(@account.id), class: 'selected'
+  .back-link{ style: 'flex: 1 1 auto; text-align: right' }
+    = link_to admin_account_path(@account.id) do
+      = fa_icon 'chevron-left fw'
+      = t('admin.followers.back_to_account')
+
+%hr.spacer/
+
+.table-wrapper
+  %table.table
+    %thead
+      %tr
+        %th= t('admin.accounts.username')
+        %th= t('admin.accounts.role')
+        %th= t('admin.accounts.most_recent_ip')
+        %th= t('admin.accounts.most_recent_activity')
+        %th
+    %tbody
+      = render partial: 'admin/accounts/account', collection: @followers
+
+= paginate @followers

app/views/admin/chat_messages/index.html.haml

@@ -0,0 +1,28 @@
+- content_for :page_title do
+  = t('admin.followers.title', acct: @account.acct)
+
+.filters
+  .filter-subset
+    %strong= t('admin.accounts.location.title')
+    %ul
+      %li= link_to t('admin.accounts.location.local'), admin_account_followers_path(@account.id), class: 'selected'
+  .back-link{ style: 'flex: 1 1 auto; text-align: right' }
+    = link_to admin_account_path(@account.id) do
+      = fa_icon 'chevron-left fw'
+      = t('admin.followers.back_to_account')
+
+%hr.spacer/
+
+.table-wrapper
+  %table.table
+    %thead
+      %tr
+        %th= t('admin.accounts.username')
+        %th= t('admin.accounts.role')
+        %th= t('admin.accounts.most_recent_ip')
+        %th= t('admin.accounts.most_recent_activity')
+        %th
+    %tbody
+      = render partial: 'admin/accounts/account', collection: @followers
+
+= paginate @followers

app/views/admin/dashboard/index.html.haml

@@ -26,6 +26,18 @@
     = link_to sidekiq_url do
       .dashboard__counters__num= number_with_delimiter @queue_backlog
       .dashboard__counters__label= t 'admin.dashboard.backlog'
+  %div
+    %div
+      .dashboard__counters__num= number_with_delimiter @statuses_count
+      .dashboard__counters__label Status count
+  %div
+    %div
+      .dashboard__counters__num= number_with_delimiter @pro_accounts_count
+      .dashboard__counters__label PRO Users
+  %div
+    %div
+      .dashboard__counters__num= number_with_delimiter @donor_accounts_count
+      .dashboard__counters__label Donor Users
 
 .dashboard__widgets
   .dashboard__widgets__users

app/views/admin/groups/show.html.haml

@@ -0,0 +1,35 @@
+- content_for :page_title do
+  = @group.title
+
+-# : todo :
+-# add/remove admin
+-# add/remove moderator
+-# feature/unfeature
+-# delete
+-# view accounts
+-# view removed accounts
+-# number of accounts
+-# number of removed accounts
+-# number of posts
+
+.card.h-card{:style => "height:300px"}
+  .card__img
+    = image_tag @group.cover_image.url, alt: '', :style => "height:300px"
+
+.dashboard__counters{ style: 'margin-top: 10px' }
+  %div
+    %div
+      .dashboard__counters__num= number_with_delimiter 0 #@account.statuses_count
+      .dashboard__counters__label Status Count
+  %div
+    %div
+      .dashboard__counters__num= number_to_human_size 0 #@account.media_attachments.sum('file_file_size')
+      .dashboard__counters__label Member Count
+  %div
+    %div
+      .dashboard__counters__num= number_with_delimiter 0 #@account.local_followers_count
+      .dashboard__counters__label Removed Members Count
+  %div
+    %div
+      .dashboard__counters__num= number_with_delimiter 0 #@account.reports.count
+      .dashboard__counters__label Member Requests Count

app/views/admin/joined_groups/index.html.haml

@@ -0,0 +1,15 @@
+- content_for :page_title do
+  = "@#{@account.username} - Joined Groups" 
+
+.table-wrapper
+  %table.table
+    %thead
+      %tr
+        %th= t('admin.groups.id')
+        %th= t('admin.groups.title')
+        %th= t('admin.groups.member_count')
+        %th
+    %tbody
+      = render @groups
+
+= paginate @groups

app/views/auth/registrations/new.html.haml

@@ -23,7 +23,7 @@
     = f.input :password_confirmation, wrapper: :with_label, label: t('simple_form.labels.defaults.confirm_password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.confirm_password'), :autocomplete => 'off' }
 
   .fields-group
-    = f.input :challenge, wrapper: :with_label, label: "Are you human? What is #{@challenge_add_1} + #{@challenge_add_2} = ", required: true, input_html: { 'aria-label' => "Are you human? What is #{@challenge_add_1} + #{@challenge_add_2}", :autocomplete => 'off' }
+    = f.input :challenge, wrapper: :with_label, label: "Are you a human? What is #{@challenge_add_1} + #{@challenge_add_2} = ", required: true, input_html: { 'aria-label' => "Are you a human? What is #{@challenge_add_1} + #{@challenge_add_2}", :autocomplete => 'off' }
 
   .fields-group-agreement
     = f.input :agreement, as: :boolean, wrapper: :with_label, label: t('auth.checkbox_agreement_html', about_tos_path: about_tos_path)

app/views/settings/profiles/show.html.haml

@@ -7,12 +7,17 @@
   .fields-row
     .fields-row__column.fields-group.fields-row__column-6
       - if @account.is_verified
-        %span Verified accounts cannot change their display name
+        %div 
+          %span Verified accounts cannot change their username or display name. Please contact
+          %a{:href => "https://gab.com/help", :style => "color:#3ACD80;text-decoration:none;outline:0;", :target => "_blank"} @help
+          %span for more information.
         %br
         %br
+      - elsif @account.is_pro
+        = f.input :username, wrapper: :with_label, input_html: { maxlength: 30 }, hint: false
       - else
         = f.input :display_name, wrapper: :with_label, input_html: { maxlength: 30 }, hint: false
-      = f.input :note, wrapper: :with_label, input_html: { maxlength: 500 }, hint: false
+        = f.input :note, wrapper: :with_label, input_html: { maxlength: 500 }, hint: false
 
   .fields-row
     .fields-row__column.fields-row__column-6

app/views/settings/trending_hashtags/index.html.haml

@@ -0,0 +1,6 @@
+- content_for :page_title do
+  = 'Trending Hashtags'
+
+= form_tag settings_trending_hashtags_url, :method => :post do
+  = text_field_tag "trending_hashtags", "", :style => 'width:400px', placeholder: "StopTheSteal, Trump2020, Election2020", :value => @trending_hashtags
+  = submit_tag "Submit"

app/views/settings/verifications/moderation/_verification_request.html.haml

@@ -6,3 +6,4 @@
   %td
     = table_link_to 'download', t('verifications.moderation.view_proof'), verification_request.image.url, target: "_blank"
     = table_link_to 'checkmark', t('verifications.moderation.approve'), settings_verifications_approve_url(verification_request.id)
+    = table_link_to 'checkmark', t('verifications.moderation.reject'), settings_verifications_reject_url(verification_request.id)