diff --git a/_episodes/introduction.md b/_episodes/introduction.md index 38dc0a9d..64fdbbb1 100644 --- a/_episodes/introduction.md +++ b/_episodes/introduction.md @@ -173,6 +173,10 @@ you're unlikely to find cost-free platforms to help you deliver dynamic content. > {: .solution } {: .challenge } +{::options parse_block_html="true" /} + +
+ ## GitHub Pages If the site you want to create is a good match to the strengths of a static site generator - @@ -185,6 +189,26 @@ Behind the scenes GitHub Pages uses a static site generator called Jekyll, which First, we need to learn more about how to author and format the content of our pages, before configuring GitHub to display this content as a website. +
+ +
+ +## GitLab Pages + +If the site you want to create is a good match to the strengths of a static site generator - +it's relatively small, will be updated relatively infrequently, and the content does not need to be personalised to the visitor - +then creating it with GitLab Pages is a good option. +GitLab Pages is a system allowing users to create and serve websites directly from their GitLab repositories. +The service is free for public repositories and simple pages can be created and served with very little configuration required. + +Behind the scenes GitLab Pages uses a static site generator to produce your website. +In the next section we will configure GitLab Pages to use the Jekyll static site generator, +which we're going to learn about later in this lesson. +First, we need to learn more about how to author and format the content of our pages, +before configuring GitLab to display this content as a website. + +
+ ## Setting Up a Repository Before we get into working with Markdown we must first create a @@ -199,6 +223,12 @@ though it can be handy if you need to revert to old versions In this lesson we will be working with this folder on the web to control the website we will be creating. +{::options parse_block_html="true" /} + +
+ +## GitHub Pages + > ## Setup a GitHub account > Before you can create a repo, you will need to > [create a GitHub account](https://github.com/join) @@ -225,6 +255,70 @@ Under the "Repository name" field type `group-website`. Repository name set to group-website +We can also add a description (for instance **Repo for learning how to make websites with jekyll pages**) so we know what this repo is when we find it again after the workshop. + +Repository name set to group-website + +Under the "Initialize this repository with:" section we will check `Add a README file` +and `Choose a license`. It is good practice to have a README file that gives more information +about your repo and to set a license for your work. + +Repository name set to group-website + +for this example repository we’ll use the `Creative Commons Zero v1.0 Universal` (CC0) license, +which allows anyone to re-use and adapt the content of the repository without restriction, +but you may want to consider choosing something more restrictive when you’re building +your own website. + +> ## Checkout other licenses +> You may want to checkout [this lesson](https://swcarpentry.github.io/git-novice/11-licensing/index.html) or +> [GitHub's license documentation](https://docs.github.com/en/free-pro-team@latest/github/creating-cloning-and-archiving-repositories/licensing-a-repository) +> for more information about possible licenses. +{: .callout} + +Repository name set to group-website + +Once you've finished these steps you can click the "Create Repository" button to +finish creating the repo. + +Filled in form with a create repository button + +GitHub will then setup the repo and it should look like the following screenshot. + +Github repository for the group website + +
+ +
+ +> ## Setup a GitLab account +> Before you can create a repo, you will need to +> [create a GitLab account](https://gitlab.com/users/sign_up) +{: .callout} + +Make sure to login with your GitLab account and visit https://gitlab.com. + + +Click the green "New" repo button on the left hand side of GitHub: + +Green New Repo Button + +**or** click the "+" menu in the upper righthand corner and +choose "New Repository". + +Dropdown plus menu with new repository option highlighted + +Next you will need to fill in some info about your repository. + +Blank new repository page + +In this lesson, we will be working on a general group website. +You can imagine this website may be for your lab group, a specific project group, +or another group you work with. +Under the "Repository name" field type `group-website`. + +Repository name set to group-website + We can also add a description (for instance **Repo for learning how to make websites with jekyll pages**) so we know what this repo is when we find it again after the workshop. @@ -258,6 +352,8 @@ GitHub will then setup the repo and it should look like the following screenshot Github repository for the group website +
+ [qwantz-easter-egg-ext]: https://chrome.google.com/webstore/detail/dinosaur-comics-easter-eg/bojkkeeefjmeogpgnlomodfkkfkfhabj {% include links.md %}