From 55439bc78fab54d88685ae79263370a377da1284 Mon Sep 17 00:00:00 2001 From: laurentheirendt <laurent.heirendt@uni.lu> Date: Wed, 23 Jan 2019 20:04:23 +0100 Subject: [PATCH] link to icon for live demo --- slides/branches.md | 12 ++++++++---- slides/configuration.md | 17 ++++++++++------- slides/forks.md | 9 ++++++--- slides/github_gitlab.md | 9 +++++++-- slides/installation.md | 7 ++++++- slides/merge.md | 3 ++- slides/syncFork.md | 2 +- slides/the_editor.md | 2 +- slides/the_terminal.md | 2 +- slides/what_is_git.md | 2 +- 10 files changed, 43 insertions(+), 22 deletions(-) diff --git a/slides/branches.md b/slides/branches.md index bbfddb58..c80f1ed3 100644 --- a/slides/branches.md +++ b/slides/branches.md @@ -16,7 +16,7 @@ A **version** of the code is referred to as a **branch**. <div class="fragment"> <br><br> -(Live Demo) +<img src="img/icon-live-demo.png" height="100px"> <br> @@ -64,7 +64,9 @@ You can switch to the `develop` branch with $ git checkout develop ``` -(Live Demo) +<div class="fragment"> +<br> +<img src="img/icon-live-demo.png" height="100px"> ## Create your own version @@ -90,5 +92,7 @@ Push your version to your fork: $ git push origin add-2-numbers ``` -<br><br> -(Live Demo) +<br> +<div class="fragment"> +<br> +<img src="img/icon-live-demo.png" height="100px"> diff --git a/slides/configuration.md b/slides/configuration.md index 46a59d12..842420df 100644 --- a/slides/configuration.md +++ b/slides/configuration.md @@ -17,17 +17,18 @@ $ git config --list <br> This should list the configuration with `user.name` and `user.email`. +<br> +Exit by typing `q`. + ## What is an SSH key? An SSH key is a secure access credential. - -## Why do I need an SSH key? - +<div class="fragment"> <br> -**Idea**: <br><br> -communicate **securely** with Github/Gitlab **without** entering the username/password. +**Principle**: <br><br> +Communicate **securely** with Github/Gitlab **without** entering the username/password. ## How do I get and set my SSH key? @@ -39,7 +40,7 @@ Check if you already have an SSH key: $ ls -al ~/.ssh ``` <br> -If there are 2 files with `id_rsa` in their name, you already have an SSH key. +If there are 2 files named `id_rsa`, you have an SSH key. <div class="fragment"> <br><br> @@ -49,5 +50,7 @@ $ ssh-keygen -t rsa -b 4096 ``` <br> -Then, add the SSH key to Github/Gitlab (see demo). +Then, add the SSH key to Github/Gitlab. +<div class="fragment"> +<img src="img/icon-live-demo.png" height="100px"> \ No newline at end of file diff --git a/slides/forks.md b/slides/forks.md index fd848cf7..c5aa8bc8 100644 --- a/slides/forks.md +++ b/slides/forks.md @@ -34,13 +34,12 @@ Browse to the original repository and click on the button `Fork`:  -(Live Demo) +<div class="fragment"> +<img src="img/icon-live-demo.png" height="100px"> ## Time to practice! -(Live Demo) - <br> Fork the practice repository: <br><br> @@ -48,6 +47,10 @@ https://git-r3lab.uni.lu/R3school/git.practice Then, clone your fork to your home directory! +<div class="fragment"> +<br> +<img src="img/icon-live-demo.png" height="100px"> + <div class="fragment"> <br> ```bash diff --git a/slides/github_gitlab.md b/slides/github_gitlab.md index 920ba0e7..46d88f86 100644 --- a/slides/github_gitlab.md +++ b/slides/github_gitlab.md @@ -10,14 +10,19 @@ GitHub is **public**, whereas GitLab is **restricted/private**. Positive point: GitHub and GitLab are (almost) the same. -## GitHub (Live Demo) +## GitHub [www.github.com](www.github.com) <br><img src="https://assets-cdn.github.com/images/modules/logos_page/GitHub-Mark.png" alt="GitHub" style="width: 200px;"/> +<div class="fragment"> +<img src="img/icon-live-demo.png" height="100px"> -## GitLab (Live Demo) + +## GitLab [https://git-r3lab.uni.lu](https://git-r3lab.uni.lu) <br><img src="https://gitlab.com/gitlab-com/gitlab-artwork/raw/master/logo/logo-extra-whitespace.png" alt="GitLab" style="width: 200px;"/> +<div class="fragment"> +<img src="img/icon-live-demo.png" height="100px"> \ No newline at end of file diff --git a/slides/installation.md b/slides/installation.md index 8c9cc67a..deec7d09 100644 --- a/slides/installation.md +++ b/slides/installation.md @@ -21,7 +21,7 @@ $ sudo apt-get install git-all ## How to get started? -**Linux (Ubuntu)** and **macOS** +**macOS** Start the `Terminal` or `iTerm`. @@ -30,6 +30,11 @@ Start the `Terminal` or `iTerm`. Start `GUI Bash`. +<br> +**Linux (Ubuntu)** + +Start the `Terminal` or `Terminator`. + ## Is `git` properly installed? diff --git a/slides/merge.md b/slides/merge.md index a47c8166..e7b39dd1 100644 --- a/slides/merge.md +++ b/slides/merge.md @@ -12,5 +12,6 @@ Use the **interface** to make use of your peers to review your code! <br> Once merged, you can delete the branch via the interface. +<div class="fragment"> <br> -(Live Demo) \ No newline at end of file +<img src="img/icon-live-demo.png" height="100px"> \ No newline at end of file diff --git a/slides/syncFork.md b/slides/syncFork.md index 75066c06..aacd622f 100644 --- a/slides/syncFork.md +++ b/slides/syncFork.md @@ -44,4 +44,4 @@ Do the same for the `develop` branch<br> ## Time to practice! -(Live Demo) \ No newline at end of file +<img src="img/icon-live-demo.png" height="100px"> \ No newline at end of file diff --git a/slides/the_editor.md b/slides/the_editor.md index 6de4cfcd..6a9ad3b5 100644 --- a/slides/the_editor.md +++ b/slides/the_editor.md @@ -8,4 +8,4 @@ Recommended editors: ## Visual Studio Code -<br>(Live Demo) \ No newline at end of file +<br><img src="img/icon-live-demo.png" height="100px"> \ No newline at end of file diff --git a/slides/the_terminal.md b/slides/the_terminal.md index 1c6c663f..61f9a9cc 100644 --- a/slides/the_terminal.md +++ b/slides/the_terminal.md @@ -43,7 +43,7 @@ in your home directory (unless otherwise configured), denoted as `~/`. List the contents of a directory ```bash -$ ls +$ ls #-lash ``` <div class="fragment"> diff --git a/slides/what_is_git.md b/slides/what_is_git.md index a0489ee7..f33694ff 100644 --- a/slides/what_is_git.md +++ b/slides/what_is_git.md @@ -11,7 +11,7 @@ <div align="left"><small>[1] *https://en.wikipedia.org/wiki/Git*</small></div> -## Funny story +## The inventor of `git`  <br><br> -- GitLab