2. EVERY TIME you go to work on YOUR repo check it's up to date with master. If it's behind it will show this so click on pull request on the right. Or look to compare.
You work on your master exactly as you normally would, once your happy with your alterations and want to send your feature to the main master do the following.
2. Check it's able to merge the alterations between your and the master will be shown below. Then click create pull request
git branch branch_name
git checkout branch_name
git checkout master
git merge branch_name
git status
and check if the origin/master is ahead of your code and :
git pull
Which should merge any changes into your changes. Here is where you can fix any conflicts.
git push
to push your new code to the origin/master.
git branch -d branch_name
git branch
will tell you what branch you are currently on if you forget.
Check out the other mockup:
Visit the live Website : Patrick's Quiz.
Patrick's Quiz is a website that promote Irish culture through the international and amazing Saint Patrick's Day Festival theme. The Goal is to bring people together in a fun and interactive way. It is presented as Pub Quiz game where user can learn about Irish culture and test their their knowledge. They are able to gain points and compare their score with other users. A special event is created at Saint Patrick's Day (The 17th of March) ???
This website will promote Irish Culture in a creative and fun environment.
- Build an interactive website using HTML, CSS, JavaScript, Python...
- Advertise and Promote Irish Culture :
- Providing accurate and useful information and facts.
- Providing a platform where users can have fun and test their knowledge.
- Providing an excellent User Experience (UX).
- Using a User Centric Development approach (UCD).
- Learn about Irish culture :
- Fun facts.
- Irish spirit and community.
- Test their knowledge.
- Gain points.
- Compare their Score with other users.
The targeted audience has no age limits and is interested in Ireland and Irish community and in particular Saint Patrick's Day.
- Playing a fun quiz/game.
- Being part of a group, a community.
- Discovering Ireland.
- It gives information about about Ireland and Irish culture.
- It provides a platform where users can test their knowledge in a pub quiz.
- It gives inspiration and motivation for being part of the Saint Patrick's Community.
-
As a first time user, I want the website to be appealing.
-
As a first time user, I want the navigation to be easy and intuitive.
-
As a first time user, I want the content to be informative but not overwhelming.
-
As a first time user, I want to understand immediately what is the website about without the need of looking for it.
-
As a first time user, I want to learn about Irish culture.
-
As a first time user, I want to be able to log in.
-
As a first time user, I want to play the pub quiz.
-
As a first time user, I want to gain points.
-
As a first time user, I want to see other users score.
-
As a returning user, I want to compare my scores.
-
As a returning user, I want to see my progress.
- FontAwesome icons will be used for better user experience.
- The logo and favicon are the same image for comfort and consistency and use the same color scheme as the website.
The color scheme of the website has been extracted from a picture using Adobe Color and swatches are said to be color blind safe by the same website using the accessibility tool.
This project uses HTML, CSS, JavaScript, Python ...
-
Balsamiq
For creating wireframes. -
Bootstrap
With the compiled CSS, JS and CDN
For the Grid system that provides responsive layout.
For the various components with built in css.
JQuery and JavaScript were provided by cdn for responsive elements. They are built in the components used in Bootstrap. -
Google Fonts
For importing fonts into the style.css file. -
Fontawesome
For using icons throughout the website. -
BeFunky For cropping some of the images.
-
Adobe Color
For extracting the color scheme used on the website. -
Am I Responsive?
For providing a screenshot of the responsiveness of the website across several devices. -
Git
For Version control. -
GitPod
For Integrated Development Environment. -
GitHub
For storing the repository. -
GitHub Pages
For deploying the website live.
This project was developed on GitPod Workspaces IDE (Integrated Development Environment) committed and pushed to Github Repository using GitPod Command Line Interface (CLI).
When a repository is created on GitHub, it is located on GitHub website ("remotely").
You can create a copy of the repository locally on your machine. This
process is called : "Cloning a repository".
When cloning a repository you are actually copying all the data that the repository
contains at that time to your machine.
To clone a repository, take the following steps :
-
Create a GitHub account.
-
Click on the Code dropdown button above the files list.
-
There are three options available to clone the repository :
- using HTTPS
- using SSH key
- using GitHub CLI
-
Choose an option and copy the link given.
-
Change the current working directory to the location where you want the cloned directory.
-
Open your IDE and in the CLI type :
git clone
and paste the link copied on step 4.
$ git clone https://github.com/YOUR-USERNAME/YOUR-REPOSITORY
- Press Enter to create your local clone.
For further information please go to Cloning a repository.
To Clone a repository Using GitPod, take the following steps :
- Create a GitHub account.
- Install the GitPod extension for Chrome or Add-on for Firefox.
- Navigate to the corresponding repository.
- Click ont the GitPod button on the top right of the files list.
- This will open a workspace on GitPod where you can work on the repository locally.
The very first time that you do this, you need to connect GitPod and GitHub together. You need to log in with GitHub and launch your workspace (As explain above). And then you need to authorize GitPod to be able to access your GitHub account. You agree to GitPod's terms and conditions, and then create a free account. Then, it will open the workspace for you. Quote from : "Creating a GitPod Workspace" on Code Institute Full Stack Software Development Programme, by Matt Rudge.
An other option is available : GitHub Desktop. It consist of cloning a repository from GitHub
to GitHub Desktop.
For full information about how to use this option, please visit GitHub Docs.
Forking a repository will copy it in your own repositories in GitHub.
A fork is a personal copy of another user's repository that lives on your account. Forks allow you to freely make changes to a project without affecting the original upstream repository. You can also open a pull request in the upstream repository and keep your fork synced with the latest changes since both repositories are still connected.
To Fork a repository take the following steps :
- Create a GitHub account.
- Navigate to the corresponding repository.
- Identify the
fork
button on the top right of the page and click on it. - Now you should find a copy of the repository in
Your repositories
.
Testing information are published in a separate file : TESTING.md
Issue : Solve :
Issue :
W3schools
For general database on software development.
Special thanks to all Code Institute's team ("Teacher", Lecturers and Tutors) that are making me more knowledgeable and are making this happen.
Huge thank you to the Slack community, its all the members and all the leads and tutors for their help and support.