This is a team project for a class in college. We were put into groups for this class and we were supposed to design and create a virtual game store using ASP.NET. It uses ASP.NET Core 2.1, Razor Pages, MS SQL Server and a code-first design.
| Role | Name | GitHub |
|---|---|---|
| Project Manager | Cameron Low | https://github.com/Clow8128 |
| Backend Developer | Lucas Winkler | https://github.com/LucasWinkler |
| Database Developer | Xander Drinnan | https://github.com/xanderdrinnan |
| Frontend Developer | Fernando Guardado | https://github.com/GuardadoFernando |
| Instance | Branch | Descriptions |
|---|---|---|
| Production | master | Accepts merges from the development branch. We will merge to this branch at the end of each iteration. |
| Development | develop | Accepts merges from feature branches. This is the branch with the latest features. |
| Features | feature-* | Work on your assigned task in a feature branch. Always branched off from develop. |
Our repository has two main branches:
developmaster
The main branch that you will be working off of is develop. You don't work directly with it. You branch off of it with a feature branch.
The master branch is for production. This branch is never to be touched. It will be merged with develop at the end of iterations and that is what we will present.
To start please clone the repo by using:
Standard: git clone https://github.com/LucasWinkler/TurboGames.git
or
SSH: git clone git@github.com:LucasWinkler/TurboGames.git
Feature branches are used when developing a new feature. It will always be merged back into the develop branch.
An example of <feature-name> could be FriendsPage so feature-FriendsPage or it could be the use case id.
- Must branch from:
develop - Must merge back into:
develop - Branch naming convention:
feature-<feature-name>
If the feature branch does not exist yet, create the branch locally and then push to GitHub.
git checkout -b feature-<feature-name> develop // creates a local branch for the new feature
git push --set-upstream origin feature-<feature-name>
Constantly commit your changes to your branch. This way you can always keep track of your feature and you can always look back at previous commits.
git add . // Add all new/changed files
git commit -m "Enter commit message here" // e.g. Added friends page, fixed this, added that etc...
You should always push these commits to the remote repository (GitHub) so that anyone can see your latest changes.
git push
If any changes have been made to develop (you should be told when this happens) after you have created your branch then you must merge develop back into your feature branch.
This will get the latest changes and merge them wih your feature so that everyone is up-to-date. It also helps with merge conflicts later on.
git checkout develop
git pull
git checkout feature-<feature-name>
git merge develop // merges changes from develop into your feature branch
When a feature is complete let Lucas know and he will merge your feature into develop and then delete the feature branch.
git checkout develop // change to the develop branch
git merge --no-ff feature-<feature-name> // the --no-ff makes sure to create a commit during merge
git push origin develop // push merge changes
git push origin :feature-<feature-name> // deletes the remote branch
git branch -d feature-<feature-name> // (optional) deletes the branch locally
If you want to discard all changes and go to the last commit:
git fetch --all
git reset --hard origin/branch-name
Migrations are what converts your Models and DbSets into code that has the ability to create the database. When you create a migration it will look for any Models and DbSets inlcuding any changes to them. This allows us to easily add to the database.
In order to add a migration you must type this command in the nuget console
<migration-name> could be AddedGameModel
add-migration <migration-name>
To create or update the database you must use
update-database
This command will call the .Up(); method from all of the migrations.
The migrations will then create the database and the tables. It will also update if the database as already been made and if there's no conflicts.
If you want to remove the last migration then type:
remove-migration
If you're unable to remove it with that command delete the database and trying agian. If it still doesn't work you can try to manually remove the migration.
There will definitely be questions as this doesn't explain nearly enough. It will explain Git well but not the project itself.
Please ask for help when needed.