add passport again
use public dir
modify package.json
modify login
login.js updated
fix merge conflict