added route for notifications

This commit is contained in:
nilsding 2014-12-14 15:17:52 +01:00
parent dec91d474d
commit c9d57e235f
3 changed files with 4 additions and 3 deletions

View File

@ -2,5 +2,6 @@ class NotificationsController < ApplicationController
before_filter :authenticate_user! before_filter :authenticate_user!
def index def index
@type = params[:type]
end end
end end

View File

@ -1 +1 @@
= nav_entry "Notifications", "/notifications/index", badge: notification_count = nav_entry "Notifications", notifications_path, badge: notification_count

View File

@ -7,8 +7,6 @@ Rails.application.routes.draw do
mount Sidekiq::Web, at: "/sidekiq" mount Sidekiq::Web, at: "/sidekiq"
end end
get 'notifications/index'
root 'static#index' root 'static#index'
match '/about', to: 'static#about', via: 'get' match '/about', to: 'static#about', via: 'get'
@ -58,6 +56,8 @@ Rails.application.routes.draw do
match '/public', to: 'public#index', via: :get, as: :public_timeline match '/public', to: 'public#index', via: :get, as: :public_timeline
match '/notifications(/:type)', to: 'notifications#index', via: :get, as: :notifications, defaults: {type: 'all'}
match '/inbox', to: 'inbox#show', via: 'get' match '/inbox', to: 'inbox#show', via: 'get'
match '/user/:username(/p/:page)', to: 'user#show', via: 'get', defaults: {page: 1} match '/user/:username(/p/:page)', to: 'user#show', via: 'get', defaults: {page: 1}