/Pttr-Web

Pttr's web platform that allows shelters to easily manage stray animals currently in their shelter as well as allows for prospective animal owners and supporters to support their local shelters.

Primary LanguageHTMLApache License 2.0Apache-2.0

Pttr Version 2

Pttr is an:

  • Web and mobile app service that connects everyday users, stray animals and rescue shelters
  • An API platform that allows developers to aggregate data about various stray animals and animal shelters in the United States.

Technology stack used

Before developing

You must have the latest SASS installed in your system. This is what Gulp will use to compile our SCSS files. We avoided using libsass and in-effect, switched from gulp-sass to gulp-ruby-sass because gulp-sass does not support SASS' new features.

  • Run npm install to install Gulp, SASS compiler, etc.
  • Run bower install to install our front-end dependencies
  • Run gulp to run the task runner.

Contributing

Git rebase vs Git merge

  • If you want your current branch to sync with master:

    • Do a git pull origin first
    • Make sure you are in your current branch and NOT the master branch - git branch -a
      • If it highlights that you are in the master branch, do git checkout <branchname> to jump to the branch you intend to be in
    • Do a git rebase master to sync up with the master branch

  • When you are done creating features or fixing bugs in your branch:

    • Switch to master git checkout master
    • Do a squashing git merge (so all the commits in your branch fit into one nice commit) git merge --squash <branchname>
    • Then a nice commit message about the general changes you have done while you were in your branch git commit
    • After making sure that the merge went without a hitch, git branch -d <branchname to delete the branch
    • git push if your branch is only local (not in Github), git push origin :<branchname> if it is!

  • To avoid annoying merge commit - "merge branch master" - Check this out