$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/
text-align: center;
margin-right: 5px;
}
+
+ &:hover {
+ color: #fff;
+ background: darken(#282c37, 1%);
+ }
}
.active {
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;
}
li {
display: inline-block;
+ margin-left: 7px;
}
}
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 {
+.api-descriptions {
+ .address {
+ samp {
+ font-weight: 400;
+
+ &.method {
+ font-weight: 500;
+ }
+ }
+ }
+}
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
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
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)
+++ /dev/null
-<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>
--- /dev/null
+- 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
+++ /dev/null
-<%- 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 %>
--- /dev/null
+= form_tag oauth_authorized_application_path(application) do
+ %input{type: "hidden", name: "_method", value: "delete"}
+ = submit_tag 'Revoke', class: 'btn'
+++ /dev/null
-<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>
--- /dev/null
+- 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
-.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.
.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
end
# If you want to restrict access to the web interface for adding oauth authorized applications, you need to declare the block below.
- # admin_authenticator do
- # # Put your admin authentication logic here.
- # # Example implementation:
- # Admin.find_by_id(session[:admin_id]) || redirect_to(new_admin_session_url)
- # end
+ admin_authenticator do
+ current_user || redirect_to(new_user_session_url)
+ end
# Authorization Code expiration time (default 10 minutes).
# authorization_code_expires_in 10.minutes
# Access token expiration time (default 2 hours).
# If you want to disable expiration, set this to nil.
- # access_token_expires_in 2.hours
+ # access_token_expires_in nil
# Assign a custom TTL for implicit grants.
# custom_access_token_expires_in do |oauth_client|
end
end
- get '/mentions', to: 'home#mentions', as: :mentions
-
root 'home#index'
end
cat aescling's git repositories / mastodon.git / commitdiff