refactor login
refactor new shop