git clone https://github.com/soedar/cs3213-project- Let's try our hardest to not merge broken code to develop
git checkout developgit pullgit checkout -b <name>-<feature>- Work on your new feature in the feature branch
git checkout developgit pullgit merge <branchName>git push
git branch -d <branchName>(local branch)git push origin --delete <branchName>(remote branch)
git checkout mastergit pullgit merge developgit push
/frontend- Web Frontend
- AngularJS
- Scaffold by Yeoman angular generator
/scratch- Web Backend
- Strongloop
- MongoDB
[sudo] npm install -g grunt-cli strongloop bower yo generator-angular
- Install MongoDB
cd frontendgrunt serve- Modify files in
frontend/appfolder when developing - Yay live reload
bower install <project> --save
cd frontendyo angular:controller <controllerName>- More info: https://github.com/yeoman/generator-angular
- We can't add routes automatically using the generator, since our routes are ui-routes. Have to do it manually :(
- Modify
frontend/app/scripts/app.jsto add a new ui route - To add a new tab, modify
frontend/app/scripts/controllers/tabsController.js
cd scratchslc run
cd frontendgrunt build- The distributed frontend code should appear in the
scratch/clientfolder