Feature/integrate angular basics