merged api and angular app