added frontend login
Resolved merge conflicts