Customized more doorkeeper views, only logged in users can create oauth apps

14 files changed, 230 insertions, 94 deletions

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index e393e2a23..9114acde4 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -8,7 +8,7 @@ $text-color: #333030;
 $lighter-text-color: #8b8687;
 
 @import url(https://fonts.googleapis.com/css?family=Roboto:400,500,400italic);
-@import url(https://fonts.googleapis.com/css?family=Roboto+Mono);
+@import url(https://fonts.googleapis.com/css?family=Roboto+Mono:400,500);
 @import "font-awesome";
 
 /* http://meyerweb.com/eric/tools/css/reset/
diff --git a/app/assets/stylesheets/dashboard.scss b/app/assets/stylesheets/dashboard.scss
index 05d495988..74192dafa 100644
--- a/app/assets/stylesheets/dashboard.scss
+++ b/app/assets/stylesheets/dashboard.scss
@@ -30,6 +30,11 @@
           text-align: center;
           margin-right: 5px;
         }
+
+        &:hover {
+          color: #fff;
+          background: darken(#282c37, 1%);
+        }
       }
 
       .active {
@@ -86,14 +91,12 @@
     background: #fff;
     padding: 20px;
     box-shadow: 0 0 5px rgba(0, 0, 0, 0.1);
-    border-bottom: 1px solid #d9e1e8;
     color: #282c37;
     font-size: 16px;
     overflow: hidden;
 
     &.alternate {
       background: lighten(#282c37, 10%);
-      border-bottom: 1px solid lighten(#282c37, 10%);
       text-align: center;
     }
 
@@ -104,6 +107,7 @@
 
       li {
         display: inline-block;
+        margin-left: 7px;
       }
     }
 
@@ -119,7 +123,71 @@
     border-radius: 0 4px 4px 0;
 
     .dashboard__content__content {
-      //padding: 20px;
+      padding: 20px;
+      color: #282c37;
+      line-height: 18px;
+
+      h3 {
+        font-size: 14px;
+        font-weight: 500;
+        margin-bottom: 15px;
+      }
+
+      p {
+        margin-bottom: 15px;
+      }
+
+      samp {
+        font-family: 'Roboto Mono', monospace;
+      }
+
+      ul {
+        list-style: circle;
+        padding-left: 15px;
+        margin-bottom: 15px;
+      }
+
+      .table {
+        width: 100%;
+
+        th {
+          font-weight: 500;
+          text-align: left;
+          border-bottom: 1px solid lighten(#282c37, 55%);
+        }
+
+        th, td {
+          padding: 5px 0;
+          line-height: 18px;
+        }
+      }
+
+      a {
+        color: #2b90d9;
+        text-decoration: underline;
+
+        &:hover {
+          text-decoration: none;
+        }
+      }
+
+      .btn {
+        display: inline-block;
+        border: 0;
+        background: #2b90d9;
+        border-radius: 4px;
+        padding: 4px 16px;
+        font-size: 12px;
+        font-weight: 500;
+        color: #fff;
+        cursor: pointer;
+        font-family: 'Roboto', sans-serif;
+        text-decoration: none;
+
+        &:hover {
+          background: lighten(#2b90d9, 5%);
+        }
+      }
     }
 
     .dashboard__top-bar {
diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss
index e69de29bb..c9f2740ad 100644
--- a/app/assets/stylesheets/home.scss
+++ b/app/assets/stylesheets/home.scss
@@ -0,0 +1,11 @@
+.api-descriptions {
+  .address {
+    samp {
+      font-weight: 400;
+
+      &.method {
+        font-weight: 500;
+      }
+    }
+  }
+}
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 5238b2fc0..c65377082 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -4,13 +4,5 @@ class HomeController < ApplicationController
   before_action :authenticate_user!
 
   def index
-    feed      = Feed.new(:home, current_user.account)
-    @statuses = feed.get(20, (params[:offset] || 0).to_i)
-  end
-
-  def mentions
-    feed      = Feed.new(:mentions, current_user.account)
-    @statuses = feed.get(20, (params[:offset] || 0).to_i)
-    render action: :index
   end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e683d9f51..18aec6dbe 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -11,4 +11,8 @@ module ApplicationHelper
   def local_id?(id)
     id.start_with?("tag:#{Rails.configuration.x.local_domain}")
   end
+
+  def active_nav_class(path)
+    current_page?(path) ? 'active' : ''
+  end
 end
diff --git a/app/services/precompute_feed_service.rb b/app/services/precompute_feed_service.rb
index bcc757222..0fb33db23 100644
--- a/app/services/precompute_feed_service.rb
+++ b/app/services/precompute_feed_service.rb
@@ -18,11 +18,11 @@ class PrecomputeFeedService < BaseService
   end
 
   def home(account)
-    Status.where(account: [account] + account.following).with_includes.with_counts
+    Status.where(account: [account] + account.following).with_includes.with_counters
   end
 
   def mentions(account)
-    Status.where(id: Mention.where(account: account).pluck(:status_id)).with_includes.with_counts
+    Status.where(id: Mention.where(account: account).pluck(:status_id)).with_includes.with_counters
   end
 
   def key(type, id)
diff --git a/app/views/doorkeeper/applications/index.html.erb b/app/views/doorkeeper/applications/index.html.erb
deleted file mode 100644
index 4a3df8305..000000000
--- a/app/views/doorkeeper/applications/index.html.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="page-header">
-  <h1><%= t('.title') %></h1>
-</div>
-
-<p><%= link_to t('.new'), new_oauth_application_path, class: 'btn btn-success' %></p>
-
-<table class="table table-striped">
-  <thead>
-  <tr>
-    <th><%= t('.name') %></th>
-    <th><%= t('.callback_url') %></th>
-    <th></th>
-    <th></th>
-  </tr>
-  </thead>
-  <tbody>
-  <% @applications.each do |application| %>
-    <tr id="application_<%= application.id %>">
-      <td><%= link_to application.name, oauth_application_path(application) %></td>
-      <td><%= application.redirect_uri %></td>
-      <td><%= link_to t('doorkeeper.applications.buttons.edit'), edit_oauth_application_path(application), class: 'btn btn-link' %></td>
-      <td><%= render 'delete_form', application: application %></td>
-    </tr>
-  <% end %>
-  </tbody>
-</table>
diff --git a/app/views/doorkeeper/applications/index.html.haml b/app/views/doorkeeper/applications/index.html.haml
new file mode 100644
index 000000000..908f664f2
--- /dev/null
+++ b/app/views/doorkeeper/applications/index.html.haml
@@ -0,0 +1,19 @@
+- content_for :page_title do
+  Applications
+
+%p= link_to t('.new'), new_oauth_application_path, class: 'btn btn-success'
+
+%table.table
+  %thead
+    %tr
+      %th= t('.name')
+      %th= t('.callback_url')
+      %th
+      %th
+  %tbody
+    - @applications.each do |application|
+      %tr
+        %td= link_to application.name, oauth_application_path(application)
+        %td= application.redirect_uri
+        %td= link_to t('doorkeeper.applications.buttons.edit'), edit_oauth_application_path(application), class: 'btn btn-link'
+        %td= render 'delete_form', application: application
diff --git a/app/views/doorkeeper/authorized_applications/_delete_form.html.erb b/app/views/doorkeeper/authorized_applications/_delete_form.html.erb
deleted file mode 100644
index 0b7e2dab3..000000000
--- a/app/views/doorkeeper/authorized_applications/_delete_form.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<%- submit_btn_css ||= 'btn btn-link' %>
-<%= form_tag oauth_authorized_application_path(application) do %>
-  <input type="hidden" name="_method" value="delete">
-  <%= submit_tag t('doorkeeper.authorized_applications.buttons.revoke'), onclick: "return confirm('#{ t('doorkeeper.authorized_applications.confirmations.revoke') }')", class: submit_btn_css %>
-<% end %>
diff --git a/app/views/doorkeeper/authorized_applications/_delete_form.html.haml b/app/views/doorkeeper/authorized_applications/_delete_form.html.haml
new file mode 100644
index 000000000..8400efcfe
--- /dev/null
+++ b/app/views/doorkeeper/authorized_applications/_delete_form.html.haml
@@ -0,0 +1,3 @@
+= form_tag oauth_authorized_application_path(application) do
+  %input{type: "hidden", name: "_method", value: "delete"}
+  = submit_tag 'Revoke', class: 'btn'
diff --git a/app/views/doorkeeper/authorized_applications/index.html.erb b/app/views/doorkeeper/authorized_applications/index.html.erb
deleted file mode 100644
index aa8657c0f..000000000
--- a/app/views/doorkeeper/authorized_applications/index.html.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<header class="page-header">
-  <h1><%= t('doorkeeper.authorized_applications.index.title') %></h1>
-</header>
-
-<main role="main">
-  <table class="table table-striped">
-    <thead>
-    <tr>
-      <th><%= t('doorkeeper.authorized_applications.index.application') %></th>
-      <th><%= t('doorkeeper.authorized_applications.index.created_at') %></th>
-      <th></th>
-      <th></th>
-    </tr>
-    </thead>
-    <tbody>
-    <% @applications.each do |application| %>
-      <tr>
-        <td><%= application.name %></td>
-        <td><%= application.created_at.strftime(t('doorkeeper.authorized_applications.index.date_format')) %></td>
-        <td><%= render 'delete_form', application: application %></td>
-      </tr>
-    <% end %>
-    </tbody>
-  </table>
-</main>
diff --git a/app/views/doorkeeper/authorized_applications/index.html.haml b/app/views/doorkeeper/authorized_applications/index.html.haml
new file mode 100644
index 000000000..f2f238e87
--- /dev/null
+++ b/app/views/doorkeeper/authorized_applications/index.html.haml
@@ -0,0 +1,16 @@
+- content_for :page_title do
+  Authorized apps
+
+%p
+  You can register a new OAuth2 app
+  = link_to 'here', oauth_applications_path
+
+%table.table
+  %thead
+    %tr
+      %th= t('doorkeeper.authorized_applications.index.application')
+      %th
+  - @applications.each do |application|
+    %tr
+      %td= application.name
+      %td= render 'delete_form', application: application
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 2d1e9c091..a3213a685 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -1,3 +1,97 @@
-.activity-stream.activity-stream-embedded
-  - @statuses.each do |status|
-    = render partial: 'stream_entries/status', locals: { status: status, include_threads: false, is_successor: false, is_predecessor: false }
+%h3 OAuth2
+%p All API methods require a valid access token.
+
+%h3 Statuses
+%ul.api-descriptions
+  %li
+    .address
+      %samp.method GET
+      %samp /api/statuses/home
+    .description
+      Returns user's home timeline
+  %li
+    .address
+      %samp.method GET
+      %samp /api/statuses/mentions
+    .description
+      Returns user's mentions timeline
+  %li
+    .address
+      %samp.method POST
+      %samp /api/statuses
+    .options
+      Options:
+      = succeed ',' do
+        %samp status
+      %samp in_reply_to_id
+    .description
+      Creates a new status, optionally as a response to another, from user's account. Returns the new status.
+  %li
+    .address
+      %samp.method GET
+      %samp /api/statuses/:id
+    .description
+      Returns a single status
+  %li
+    .address
+      %samp.method POST
+      %samp /api/statuses/:id/reblog
+    .description
+      Reblogs a status from user's account. Returns the target status.
+  %li
+    .address
+      %samp.method POST
+      %samp /api/statuses/:id/favourite
+    .description
+      Favourites a status from user's account. Returns the target status.
+
+%h3 Accounts
+%ul.api-descriptions
+  %li
+    .address
+      %samp.method GET
+      %samp /api/accounts/:id
+    .description
+      Returns a single account
+  %li
+    .address
+      %samp.method GET
+      %samp /api/accounts/:id/statuses
+    .description
+      Returns an account's statuses
+  %li
+    .address
+      %samp.method GET
+      %samp /api/accounts/:id/followers
+    .description
+      Returns accounts following an account
+  %li
+    .address
+      %samp.method GET
+      %samp /api/accounts/:id/following
+    .description
+      Returns the accounts the target account follows
+  %li
+    .address
+      %samp.method POST
+      %samp /api/accounts/:id/follow
+    .description
+      Follows target account from the user's account. Returns the target account.
+  %li
+    .address
+      %samp.method POST
+      %samp /api/accounts/:id/unfollow
+    .description
+      Unfollows target account from the user's account. Returns the target account.
+
+%h3 Follows
+%ul.api-descriptions
+  %li
+    .address
+      %samp.method POST
+      %samp /api/follows
+    .options
+      Options:
+      %samp uri
+    .description
+      Follows a user, regardless of where they are, from user's account. URI assumed to be of username@domain form. Returns the target account.
diff --git a/app/views/layouts/dashboard.html.haml b/app/views/layouts/dashboard.html.haml
index 128bf8db9..ea8390bae 100644
--- a/app/views/layouts/dashboard.html.haml
+++ b/app/views/layouts/dashboard.html.haml
@@ -6,38 +6,23 @@
       .dashboard__current-user
         = link_to account_path(current_user.account) do
           = image_tag current_user.account.avatar.url(:medium), class: 'dashboard__current-user__avatar'
-          %strong.dashboard__current-user__display-name= current_user.account.display_name
+          %strong.dashboard__current-user__display-name= current_user.account.display_name.blank? ? current_user.account.username : current_user.account.display_name
           %span.dashboard__current-user__username= "@#{current_user.account.username}"
       %ul
-        %li.active
+        %li{ class: active_nav_class(root_path) }
           = link_to root_path do
             = fa_icon 'home'
             Home
-        %li
-          = link_to mentions_path do
-            = fa_icon 'at'
-            Mentions
-        %li
-          = link_to root_path do
-            = fa_icon 'group'
-            Subscriptions
-        %li
+        %li{ class: active_nav_class(oauth_authorized_applications_path) }
           = link_to oauth_authorized_applications_path do
             = fa_icon 'shield'
             Authorized apps
-        %li
-          = link_to root_path do
-            = fa_icon 'user'
-            Edit profile
-        %li
-          = link_to edit_registration_path(current_user) do
-            = fa_icon 'wrench'
-            Change password
     .dashboard__content
       .dashboard__top-bar
-        Home
+        = content_for?(:page_title) ? yield(:page_title) : 'Mastodon'
         %ul
-          %li= link_to fa_icon('sign-out'), destroy_user_session_path, method: :delete
+          %li= link_to fa_icon('gear'), edit_registration_path(current_user), title: 'Change password'
+          %li= link_to fa_icon('sign-out'), destroy_user_session_path, method: :delete, title: 'Sign out'
       .dashboard__content__content= yield
   .footer
     .domain= Rails.configuration.x.local_domain