ChicagoVeg is a non-profit organization in Chicago, whose goal is to promote veganism, vegetarians and raw veganism in Chicagoland. The organization has updated its restaurant application (http://www.chicagoveg.com/restaurants/). The primary goal of the update was to improve users’ mobile experience. Some changes made were:
– Fixed issue with map getting out of bounds on mobile and tablet
– Added warning message for users using IE 8 and lower (Google only supports IE 9 and above so the restaurant app is forced to too)
– Corrected issue in mobile where direction overflowed
– Added ability for users to post information about the site on social media
– Enlarged filtering options (e.g. Name | Distance in Restaurant list) to improve visibility and click-ability in mobile
– Fixed issue with mobile where address boxes was getting misaligned
This blog is a summary of a way of setting up an environment to use git and checking in code. It assumes you have used a form of source control. If you are a total newbie to programming, try this first – https://try.github.io/levels/1/challenges/1
This blog uses an application called restaurant listing application (https://github.com/ChicagoVeg/restaurantList) for demonstration purposes. Change references to this to suit your needs.
- Download git: http://git-scm.com/download
- Create a repository in github. Go to your github page and click on the Repository-button.
Steps Up Environment
- Create a directory on your local drive, where you want the code.
- Go to PowerShell or Command Prompt or some other command line application that supports git; and go to the directory from Step #1
- In the prompt, type in (to set up directory to be a local git repo):
- Get the code (you will find the URL in the github page, under “HTTPS clone URL”, on the right-hand-side):
git remote add origin https://github.com/ChicagoVeg/restaurantList.git
- Create a master branch
git checkout -t -b master origin/master
- Track changes
git branch --set-upstream-to=origin/master
- If you get an issue where a path name is too long, run this command:
git config --system core.longpaths true
- If you get an error where there is no tracking information (means you skipped this step above), run this:
git branch --set-upstream master origin/master
Checking in Code
- Get the code onto your local repo. Reminder, git is about each user having their local repo (for your own changes) and everyone sharing a group-repo (cumulative code one or more people shared)
- Tracking untracked files (Adding new files to your local repo)
To untracked files (files not already in github) to the commit package, use this:
git add .
Note: This add all untracked files. If you want to add specific files, adjust ths. See this for more more information: https://www.kernel.org/pub/software/scm/git/docs/git-add.html.
- Here is a way of committing changes to your local repo:
git commit -am "This is some comment Fixed #4"Note: (1)This will NOT check in the code to the main repository for others to use. It commits it to your local, which you can later check in for others to use. The push command does the check in and that will be discusses later. (2)This is unnecessary if you have no newly added files. (3)In “-am”, the ‘a’ stands adds all changes while the ‘m’ is for commenting. This is not appropriate if you do not want to add all recent changes to your local repository. Use a different option for commit as suites your needs. (4)The “#4” in the commit associated the check-in to an issue number. It can be left out the comment if you are not associating the commit to an issue. Although I advise to always associate check-ins to something.
- To submit code from your local repo to the shared repo, use this command:
Note: This pulls from your local repository and pushed it to github.
A tutorial with less verbose than this can be found here: http://davidgiard.com/2016/01/30/MyCommonGitCommands.aspx