Skip to content

Commit

Permalink
fix admin issue
Browse files Browse the repository at this point in the history
  • Loading branch information
rahmatullah5 committed May 25, 2018
1 parent 24926ea commit 9d8a8f4
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 15 deletions.
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ gem 'rails_admin'
gem 'rails_admin_history_rollback'
gem 'cloudinary'
gem 'devise'
gem 'devise_token_auth'
gem 'pry-rails', '~> 0.3.4'
gem 'audited'
gem 'paper_trail'
Expand Down
3 changes: 1 addition & 2 deletions app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
class ApplicationController < ActionController::Base
include DeviseTokenAuth::Concerns::SetUserByToken
protect_from_forgery with: :null_session, if: ->{request.format.json?}
before_action :set_paper_trail_whodunnit
protect_from_forgery with: :null_session
end
5 changes: 3 additions & 2 deletions app/models/user.rb
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
class User < ActiveRecord::Base
# Include default devise modules. Others available are:
# :confirmable, :lockable, :timeoutable and :omniauthable
has_paper_trail
devise :database_authenticatable, :registerable,
:recoverable, :rememberable, :trackable, :validatable
include DeviseTokenAuth::Concerns::User

mount_uploader :avatar, ImageUploader
validates :name, presence: true
validates :username, uniqueness: true
has_paper_trail
validates :username, presence: true, uniqueness: true

end
13 changes: 3 additions & 10 deletions config/routes.rb
Original file line number Diff line number Diff line change
@@ -1,23 +1,16 @@
Rails.application.routes.draw do
devise_for :admins
root 'pages#landing'

mount RailsAdmin::Engine => '/admin', as: 'rails_admin'

root 'pages#landing'
mount_devise_token_auth_for 'User', at: '/api/v1/users', controllers: {
registrations: 'api/v1/registrations'
# sessions: 'api/v1/sessions',
# passwords: 'api/v1/passwords'

}

namespace :api, defaults: { format: :json } do
namespace :v1 do
# get 'versions/state' => 'versions#state'
# post 'users/login' => 'sessions#create'
# delete 'users/logout' => 'sessions#destroy'
# post 'users/reset_password' => 'users#reset_password'
# resources :users, only: [:create, :destroy]
devise_scope :user do

resources :products, only: [:index, :show]
resources :feedbacks, only: [:create]
end
Expand Down

0 comments on commit 9d8a8f4

Please sign in to comment.