A web application for customers and staff to manage restaurant orders.
To setup the environment...
- Run "git clone https://github.com/chrisfandrade16/ros.git" on your computer
- Run "cd ros" to enter the application's directory
- Install the "Prettier" extension on your text editor for consistent formatting
- Go to Code -> Preferences -> Settings, search "Format on Save", and check that box
- Select and right-click any code, click "Format Document", and choose "Prettier" as your default formatter
To create your branch...
- Run "git checkout master" to enter master branch
- Run "git pull" to get latest changes
- Run "git branch < your_branch_name >" to create your branch based on the latest master branch
- Run "git checkout < your_branch_name >" to enter your branch
To run your branch...
- Run "npm install" at root directory to install required libraries
- Run "npm run start" at root directory to run a local development server for viewing the compiled application live in browser
To save your branch...
- Add desired changes to code
- Run "git add *" from root directory to stage all your changes
- Run "git commit -m < your_commit_message >" to commit your changes
- Run "git push" to push your changes to your branch
To merge your branch...
- Run "git checkout master" to enter the master branch
- Run "git pull" to get latest changes
- Run "git checkout < your_branch_name > to enter your brnach
- Run "git rebase master" to get all the new changes from master onto your branch before merging
- Run "git rebase --skip" continuously until the rebase is no longer in progress (this is to skip all coomit-by-commit conflicts in favour of seeing all merge conflicts at once)
- Run "git pull" to bring all commits from the master branch into your branch, and see all merge conflicts if any
- Use your text editor to solve all merge conflicts if any
- Run "npm run build" to update the build (compiles a static single HTML file of the whole application)
- Run "git add *", "git commit -m < your_commit_message >", and "git push" to stage, commit, and push your resolved conflicts to your branch
- Submit a pull request on GitHub to get confirmation before merging your branch into the master branch