To develop, we run:
1. Add dev.ts file to /config
Without dev.ts you won't be abble to develop localy with DB connected. (You can accually mockup JSON as a response from server if you wish so).
2. Server:
cd show-me-code
npm run watch-ts
// in 1 terminal
npm run watch-node
// in 2 terminal
Now you can develop backend code.
3. Frontend
cd show-me-code/client
ng serve
- in 3 terminal
Now you can develop frontend code.
GIT-FLOW:
- clone repo:
git clone https://github.com/czechue/show-me-code.git
- check if everything is up to data:
git pull
git fetch
- add your branch:
git checkout -b <tasktype/tasknumber/name>
where <tasktype/tasknumber/name-of-task>
is your branch name and sub-parts have following meaning:
- tasktype = feature / bugfix / hotfix
- tasknumber = number from trello
- name-of-task = name of task
-
you can HACK NOW
-
from time to time remember about commiting:
git add <files>
git commit -m "use proper commit descriptions"
- when you want to save your branch on GH repo:
git push origin <your-branch-name>
(!!before you push - always first pull current master branch so you can solve conflicts locally)
'git checkout master' // change branch on master
'git pull'
'git checkout <your-branch-name>' // go back to your branch
'git merge master' // merge master branch into your branch
- when you think your code is finished:
- go on repo page: https://github.com/czechue/show-me-code
- create Pull Request: GH Link
- your branch can be merged now
dodawanie drugi raz xx