WIP

app/views/directories/index.html.haml

@@ -10,46 +10,13 @@
   = opengraph 'og:description', t('directories.explanation')
   = opengraph 'og:image', File.join(root_url, 'android-chrome-192x192.png')
 
-.page-header
-  %h1= t('directories.explore_mastodon', title: site_title)
-  %p= t('directories.explanation')
+  %meta{name: 'applicationServerKey', content: Rails.configuration.x.vapid_public_key}
+  = render_initial_state
+  = javascript_pack_tag 'application', crossorigin: 'anonymous'
 
-- if @accounts.empty?
-  = nothing_here
-- else
-  .directory__list
-    - @accounts.each do |account|
-      .directory__card
-        .directory__card__img
-          = image_tag account.header.url, alt: ''
-        .directory__card__bar
-          = link_to TagManager.instance.url_for(account), class: 'directory__card__bar__name' do
-            .avatar
-              = image_tag account.avatar.url, alt: '', class: 'u-photo'
+.app-holder#mastodon{ data: { props: Oj.dump(default_props) } }
+  %noscript
+    = image_pack_tag 'logo.svg', alt: 'Mastodon'
 
-            .display-name
-              %bdi
-                %strong.emojify.p-name= display_name(account, custom_emojify: true)
-              %span= acct(account)
-          .directory__card__bar__relationship.account__relationship
-            = minimal_account_action_button(account)
-
-        .directory__card__extra
-          .account__header__content.emojify= Formatter.instance.simplified_format(account, custom_emojify: true)
-
-        .directory__card__extra
-          .accounts-table__count
-            = number_to_human account.statuses_count, strip_insignificant_zeros: true
-            %small= t('accounts.posts', count: account.statuses_count).downcase
-          .accounts-table__count
-            = number_to_human account.followers_count, strip_insignificant_zeros: true
-            %small= t('accounts.followers', count: account.followers_count).downcase
-          .accounts-table__count
-            - if account.last_status_at.present?
-              %time.time-ago{ datetime: account.last_status_at.to_date.iso8601, title: l(account.last_status_at.to_date) }= l account.last_status_at.to_date
-            - else
-              = t('accounts.never_active')
-
-            %small= t('accounts.last_active')
-
-  = paginate @accounts
+    %div
+      = t('errors.noscript_html', apps_path: 'https://joinmastodon.org/apps')

app/views/follower_accounts/index.html.haml

@@ -5,16 +5,13 @@
   %meta{ name: 'robots', content: 'noindex' }/
   = render 'accounts/og', account: @account, url: account_followers_url(@account, only_path: false)
 
-= render 'accounts/header', account: @account
+  %meta{name: 'applicationServerKey', content: Rails.configuration.x.vapid_public_key}
+  = render_initial_state
+  = javascript_pack_tag 'application', crossorigin: 'anonymous'
 
-- if @account.user_hides_network?
-  .nothing-here= t('accounts.network_hidden')
-- elsif user_signed_in? && @account.blocking?(current_account)
-  .nothing-here= t('accounts.unavailable')
-- elsif @follows.empty?
-  = nothing_here
-- else
-  .card-grid
-    = render partial: 'application/card', collection: @follows.map(&:account), as: :account
+.app-holder#mastodon{ data: { props: Oj.dump(default_props) } }
+  %noscript
+    = image_pack_tag 'logo.svg', alt: 'Mastodon'
 
-  = paginate @follows
+    %div
+      = t('errors.noscript_html', apps_path: 'https://joinmastodon.org/apps')

app/views/following_accounts/index.html.haml

@@ -5,16 +5,13 @@
   %meta{ name: 'robots', content: 'noindex' }/
   = render 'accounts/og', account: @account, url: account_followers_url(@account, only_path: false)
 
-= render 'accounts/header', account: @account
+  %meta{name: 'applicationServerKey', content: Rails.configuration.x.vapid_public_key}
+  = render_initial_state
+  = javascript_pack_tag 'application', crossorigin: 'anonymous'
 
-- if @account.user_hides_network?
-  .nothing-here= t('accounts.network_hidden')
-- elsif user_signed_in? && @account.blocking?(current_account)
-  .nothing-here= t('accounts.unavailable')
-- elsif @follows.empty?
-  = nothing_here
-- else
-  .card-grid
-    = render partial: 'application/card', collection: @follows.map(&:target_account), as: :account
+.app-holder#mastodon{ data: { props: Oj.dump(default_props) } }
+  %noscript
+    = image_pack_tag 'logo.svg', alt: 'Mastodon'
 
-  = paginate @follows
+    %div
+      = t('errors.noscript_html', apps_path: 'https://joinmastodon.org/apps')

app/views/notification_mailer/_status.html.haml

@@ -42,4 +42,4 @@
                                         = link_to a.remote_url, a.remote_url
 
                               %p.status-footer
-                                = link_to l(status.created_at), web_url("statuses/#{status.id}")
+                                = link_to l(status.created_at), short_account_status_url(status.account.acct, status.id)

app/views/notification_mailer/_status.text.erb

@@ -5,4 +5,4 @@
 <% end %>
 <%= raw Formatter.instance.plaintext(status) %>
 
-<%= raw t('application_mailer.view')%> <%= web_url("statuses/#{status.id}") %>
+<%= raw t('application_mailer.view')%> <%= short_account_status_url(status.account.acct, status.id) %>

app/views/notification_mailer/digest.html.haml

@@ -19,7 +19,7 @@
                                 %tbody
                                   %tr
                                     %td.button-primary
-                                      = link_to web_url do
+                                      = link_to home_url do
                                         %span= t 'notification_mailer.digest.action'
 
 - @notifications.each_with_index do |n, i|

app/views/notification_mailer/digest.text.erb

@@ -7,7 +7,7 @@
 
   <%= raw Formatter.instance.plaintext(notification.target_status) %>
 
-  <%= raw t('application_mailer.view')%> <%= web_url("statuses/#{notification.target_status.id}") %>
+  <%= raw t('application_mailer.view')%> <%= short_account_status_url(notification.target_status.account.acct, notification.target_status.id) %>
 <% end %>
 <% if @follows_since > 0 %>
 

app/views/notification_mailer/favourite.html.haml

@@ -41,5 +41,5 @@
                             %tbody
                               %tr
                                 %td.button-primary
-                                  = link_to web_url("statuses/#{@status.id}") do
+                                  = link_to short_account_status_url(status.account.acct, status.id) do
                                     %span= t 'application_mailer.view_status'

app/views/notification_mailer/follow.html.haml

@@ -39,5 +39,5 @@
                             %tbody
                               %tr
                                 %td.button-primary
-                                  = link_to web_url("accounts/#{@account.id}") do
+                                  = link_to short_account_url(@account.acct) do
                                     %span= t 'application_mailer.view_profile'

app/views/notification_mailer/follow.text.erb

@@ -2,4 +2,4 @@
 
 <%= raw t('notification_mailer.follow.body', name: @account.acct) %>
 
-<%= raw t('application_mailer.view')%> <%= web_url("accounts/#{@account.id}") %>
+<%= raw t('application_mailer.view')%> <%= short_account_url(@account.acct) %>

app/views/notification_mailer/follow_request.html.haml

@@ -39,5 +39,5 @@
                             %tbody
                               %tr
                                 %td.button-primary
-                                  = link_to web_url("follow_requests") do
+                                  = link_to follow_requests_url do
                                     %span= t 'notification_mailer.follow_request.action'

app/views/notification_mailer/follow_request.text.erb

@@ -2,4 +2,4 @@
 
 <%= raw t('notification_mailer.follow_request.body', name: @account.acct) %>
 
-<%= raw t('application_mailer.view')%> <%= web_url("follow_requests") %>
+<%= raw t('application_mailer.view')%> <%= follow_requests_url %>

app/views/notification_mailer/mention.html.haml

@@ -41,5 +41,5 @@
                             %tbody
                               %tr
                                 %td.button-primary
-                                  = link_to web_url("statuses/#{@status.id}") do
+                                  = link_to short_account_status_url(@status.account.acct, @status.id) do
                                     %span= t 'notification_mailer.mention.action'

app/views/notification_mailer/reblog.html.haml

@@ -41,5 +41,5 @@
                             %tbody
                               %tr
                                 %td.button-primary
-                                  = link_to web_url("statuses/#{@status.id}") do
+                                  = link_to short_account_status_url(@status.account.acct, @status.id) do
                                     %span= t 'application_mailer.view_status'

app/views/public_timelines/show.html.haml

@@ -3,15 +3,13 @@
 
 - content_for :header_tags do
   %meta{ name: 'robots', content: 'noindex' }/
-  = javascript_pack_tag 'about', crossorigin: 'anonymous'
+  %meta{name: 'applicationServerKey', content: Rails.configuration.x.vapid_public_key}
+  = render_initial_state
+  = javascript_pack_tag 'application', crossorigin: 'anonymous'
 
-.page-header
-  %h1= t('about.see_whats_happening')
+.app-holder.notranslate#mastodon{ data: { props: Oj.dump(default_props) } }
+  %noscript
+    = image_pack_tag 'logo.svg', alt: 'Mastodon'
 
-  - if Setting.show_known_fediverse_at_about_page
-    %p= t('about.browse_public_posts')
-  - else
-    %p= t('about.browse_local_posts')
-
-#mastodon-timeline{ data: { props: Oj.dump(default_props.merge(local: !Setting.show_known_fediverse_at_about_page)) }}
-.notranslate#modal-container
+    %div
+      = t('errors.noscript_html', apps_path: 'https://joinmastodon.org/apps')

app/views/statuses/_detailed_status.html.haml

@@ -77,4 +77,4 @@
 
     - if user_signed_in?
       ·
-      = link_to t('statuses.open_in_web'), web_url("statuses/#{status.id}"), class: 'detailed-status__application', target: '_blank'
+      = link_to t('statuses.open_in_web'), short_account_status_url(status.account.acct, status.id), class: 'detailed-status__application', target: '_blank'

app/views/statuses/show.html.haml

@@ -17,9 +17,13 @@
   = render 'og_description', activity: @status
   = render 'og_image', activity: @status, account: @account
 
-.grid
-  .column-0
-    .activity-stream.h-entry
-      = render partial: 'status', locals: { status: @status, include_threads: true }
-  .column-1
-    = render 'application/sidebar'
+  %meta{name: 'applicationServerKey', content: Rails.configuration.x.vapid_public_key}
+  = render_initial_state
+  = javascript_pack_tag 'application', crossorigin: 'anonymous'
+
+.app-holder#mastodon{ data: { props: Oj.dump(default_props) } }
+  %noscript
+    = image_pack_tag 'logo.svg', alt: 'Mastodon'
+
+    %div
+      = t('errors.noscript_html', apps_path: 'https://joinmastodon.org/apps')

app/views/tags/show.html.haml

@@ -5,12 +5,15 @@
   %meta{ name: 'robots', content: 'noindex' }/
   %link{ rel: 'alternate', type: 'application/rss+xml', href: tag_url(@tag, format: 'rss') }/
 
-  = javascript_pack_tag 'about', crossorigin: 'anonymous'
   = render 'og'
 
-.page-header
-  %h1= "##{@tag.name}"
-  %p= t('about.about_hashtag_html', hashtag: @tag.name)
+  %meta{name: 'applicationServerKey', content: Rails.configuration.x.vapid_public_key}
+  = render_initial_state
+  = javascript_pack_tag 'application', crossorigin: 'anonymous'
 
-#mastodon-timeline{ data: { props: Oj.dump(default_props.merge(hashtag: @tag.name, local: @local)) }}
-.notranslate#modal-container
+.app-holder.notranslate#mastodon{ data: { props: Oj.dump(default_props) } }
+  %noscript
+    = image_pack_tag 'logo.svg', alt: 'Mastodon'
+
+    %div
+      = t('errors.noscript_html', apps_path: 'https://joinmastodon.org/apps')

app/views/user_mailer/welcome.html.haml

@@ -114,7 +114,7 @@
                                 %tbody
                                   %tr
                                     %td.button-primary
-                                      = link_to web_url do
+                                      = link_to home_url do
                                         %span= t 'user_mailer.welcome.final_action'
 
 %table.email-table{ cellspacing: 0, cellpadding: 0 }

app/views/user_mailer/welcome.text.erb

@@ -17,7 +17,7 @@
 
 <%= t 'user_mailer.welcome.final_step' %>
 
-=> <%= web_url %>
+=> <%= home_url %>
 
 ---