taskful v2.0

taskful is an improved organizer that solves duties (chores) within the household. Utilizing a login, it redirects you to the page of tasks where you can select a task based on points and priority. Based on the selection chosen, it will show up on your personal user profile.

Getting Started

Prerequisites

Please note this is an in-development project and may have errors upon installation.

In order to contribute to this project, please use the below code to install dependencies.

• npm

  npm install --force

Starting Notes

• Main branch is only for production
• Dev branch is for development. Two person review process for pull requests to the dev and main branch.

Starting off

• 1. Clone main repository to local machine
• 2. git checkout -b [name/feature] -> Create feature branch off main or dev
• 3. Commit to your local feature branch often!

Pushing changes to the main repo

• 1. 'Git checkout dev' (locally switch to dev branch)

• 2. 'Git pull origin dev' (Pull updates of dev down to your local system)

• 3. 'Git checkout [your branch] (switch back to your branch locally)

• 4. 'Git merge dev' (Brings dev into your local branch)

• 5. Resolve conflicts or :q if there aren't any

• 6. 'Git push origin ' (Push merged branch up to github)

• 7. Create a pull request in github from ==> dev

• 8. Repeat as needed

• 9. When ready to publish main, do step 7 but from dev => main

  git checkout dev
  git pull origin dev
  git checkout <name/feature>
  git merge dev
  // Resolve Merge conflicts
  git push origin <name/feature>
  

Contact

Brian Yang - @yangbrian310

Eden Shirin - @EdSheranaway

Ji Kim - @dwejikim

David Cheng - @DavidZCheng

Project Link: (https://github.com/HeatSeekingDevilChickenPrime/taskfulv2)

(back to top)