add admin.js in controller and routes
merge conflict resolved