diff --git a/2022/2022-05-17_presentationTest/slides/VScodeGUI.md b/2022/2022-05-17_presentationTest/slides/VScodeGUI.md new file mode 100644 index 0000000000000000000000000000000000000000..25de27f7f9e772ded02df0682076be8cfb4e9f16 --- /dev/null +++ b/2022/2022-05-17_presentationTest/slides/VScodeGUI.md @@ -0,0 +1,16 @@ +# VS Code User Interface + +Make text shorter + +- **Activity Bar** - Located on the far left-hand side, this lets you switch between views and gives you additional context-specific indicators, like the number of outgoing changes when Git is enabled. +- **Side Bar** - Contains different views like the Explorer to assist you while working on your project. +- **Editor** - The main area to edit your files. You can open as many editors as you like side by side vertically and horizontally. +- **Panels** - You can display different panels below the editor region for output or debug information, errors and warnings, or an integrated terminal. Panel can also be moved to the right for more vertical space. +- **Status Bar** - Information about the opened project and the files you edit. + + +<div style="position:absolute;right:0%;top:10%"> +<img src="slides/img/VSCodeGUI.png" height="750px"> +</div> + +Text and image from VS Code documentation \ No newline at end of file diff --git a/2022/2022-05-17_presentationTest/slides/add-to-workspace.md b/2022/2022-05-17_presentationTest/slides/add-to-workspace.md index 63fc8e79ac23061e6e831b141fc5e118da3d1974..1785a8e618151a0bc1b82edb8f484dc16543569a 100644 --- a/2022/2022-05-17_presentationTest/slides/add-to-workspace.md +++ b/2022/2022-05-17_presentationTest/slides/add-to-workspace.md @@ -3,7 +3,7 @@ You have a copy of repository on your laptop. You can work on it now and use terminal to interact with Git or setup VS Code to simplify this interaction. -- Open VS Code - Go to **File > Add Folder to Workspace**<br> -<img height="230px" src="slides/img/addFolder.png"> -- Add your project folder +<img height="230px" src="slides/img/add-root-folder.png"> +- Add your project folder<br> +<img height="230px" src="slides/img/addProject.png"> \ No newline at end of file diff --git a/2022/2022-05-17_presentationTest/slides/branch.md b/2022/2022-05-17_presentationTest/slides/branch.md new file mode 100644 index 0000000000000000000000000000000000000000..37a561b557255dbbd309be8687b8bab9df638a2e --- /dev/null +++ b/2022/2022-05-17_presentationTest/slides/branch.md @@ -0,0 +1,10 @@ +# Create new branch + +To encapsulate your changes, isolate your work from other and help Git to easile merge virsions later, we work on branches. + +- Click on branch symbol in side bat (bottom of VS Code window)<br> +<img height="100px" src="slides/img/branch.png"> +- Choose "+ Create New Branch..."<br> +<img height="230px" src="slides/img/newBranch.png"> +- Give the name to your new branch<br> +<img height="100px" src="slides/img/newBranchSwitched.png"> \ No newline at end of file diff --git a/2022/2022-05-17_presentationTest/slides/clone.md b/2022/2022-05-17_presentationTest/slides/clone.md index 202de2043df192b1e81615c3e0ecd402e533776b..98f220e119d331fb30e392d2c12e697f29df9164 100644 --- a/2022/2022-05-17_presentationTest/slides/clone.md +++ b/2022/2022-05-17_presentationTest/slides/clone.md @@ -1,11 +1,12 @@ # Download your copy to your laptop - clone -Now you have your copy of the repository on server. YOu need to download it to your laptop. +Now you have your copy of the repository on server. You need to download it to your laptop. In git words: you need you *clone your fork*: -- go to your projects (top left corner with LCSB logo) -- find **basic-practice-pages** project under your name and where you are the owner -- press *Clone* and then *Clone with SSH*. Part of the command will be in your clipboard now.<br> +- Go to your projects (top left corner with LCSB logo) +- Find **basic-practice-pages** project under your name and where you are the owner +- Press *Clone* and then *Clone with SSH*. URL will be in your clipboard now.<br> <img height="230px" src="slides/img/clone.png"> -- open terminal and navigate to your desired folder (use 'cd ..' and 'cd/') -- type ```git clone ssh-from-clipboad```<br> -<img height="230px" src="slides/img/clone-term.png"> +- Open VS Code. If you haven't opened a folder yet, the VS Code view will show you a buttor to Clone Repository. Otherwise, go to View > Command Pallete and type "clone":<br> +<img height="230px" src="slides/img/firstrun-source-control.png"> +- You will be asked for the URL of the remote repository (you have it in your clipboard now) and the place where to put files on your computer. +<img height="230px" src="slides/img/clone-SSH.png"> diff --git a/2022/2022-05-17_presentationTest/slides/commit.md b/2022/2022-05-17_presentationTest/slides/commit.md new file mode 100644 index 0000000000000000000000000000000000000000..6ff705d06aacaa45fa676741f2569693c724b140 --- /dev/null +++ b/2022/2022-05-17_presentationTest/slides/commit.md @@ -0,0 +1,13 @@ +# Make changes and commit them + +When you change file/s VS Code with remind you of unsaved changes (left image) and saved by not commited changes (rigth image):<br> +<img height="230px" src="slides/img/UnsavedChanges.png"> +<img height="230px" src="slides/img/SavedButUncommitedChanges.png"> + +To commit your changes: +1. Go to Source Control in Activity Bar +2. Stage all changes you want to commit (press +) +3. Describe your changes in commit message +4. Commit your changes (press "tick") + +<img height="230px" src="slides/img/commit.png"> \ No newline at end of file diff --git a/2022/2022-05-17_presentationTest/slides/fork.md b/2022/2022-05-17_presentationTest/slides/fork.md index 1ea2d0236b27cfbcdc825f25c9504e8fe2db3b0a..e339d6f8178267c63a39dfc2710961adee32242b 100644 --- a/2022/2022-05-17_presentationTest/slides/fork.md +++ b/2022/2022-05-17_presentationTest/slides/fork.md @@ -4,7 +4,11 @@ As you already know it is not nice to work on original repository. You need to create a copy of the repository for yourself. -In git words: you need to *fork* repository. -<br><br> -Go to [https://gitlab.lcsb.uni.lu/R3/school/git/basic-practice-pages](https://gitlab.lcsb.uni.lu/R3/school/git/basic-practice-pages) and fork (make it private and select your namespace) <br> +In git words: you need to *fork* repository.<br><br> + +Go to [https://gitlab.lcsb.uni.lu/R3/school/git/basic-practice-pages](https://gitlab.lcsb.uni.lu/R3/school/git/basic-practice-pages) and fork + +- make it public or private depending on orginal repository) +- select your namespace + <img height="230px" src="slides/img/fork.png"> diff --git a/2022/2022-05-17_presentationTest/slides/img/SavedButUncommitedChanges.png b/2022/2022-05-17_presentationTest/slides/img/SavedButUncommitedChanges.png new file mode 100644 index 0000000000000000000000000000000000000000..4786c3eb5665570a1760a6b2cf94358bb2eedbcc Binary files /dev/null and b/2022/2022-05-17_presentationTest/slides/img/SavedButUncommitedChanges.png differ diff --git a/2022/2022-05-17_presentationTest/slides/img/UnsavedChanges.png b/2022/2022-05-17_presentationTest/slides/img/UnsavedChanges.png new file mode 100644 index 0000000000000000000000000000000000000000..5bfcd921afede1192fa4044d7bf0639c7a646ee0 Binary files /dev/null and b/2022/2022-05-17_presentationTest/slides/img/UnsavedChanges.png differ diff --git a/2022/2022-05-17_presentationTest/slides/img/VSCodeGUI.png b/2022/2022-05-17_presentationTest/slides/img/VSCodeGUI.png new file mode 100644 index 0000000000000000000000000000000000000000..68e951d9e21b734d403a37f11c40f19800a603c2 Binary files /dev/null and b/2022/2022-05-17_presentationTest/slides/img/VSCodeGUI.png differ diff --git a/2022/2022-05-17_presentationTest/slides/img/add-root-folder.png b/2022/2022-05-17_presentationTest/slides/img/add-root-folder.png new file mode 100644 index 0000000000000000000000000000000000000000..83cc0357f8f6d9d2b8bcdf7038bca2e7fc796d2a Binary files /dev/null and b/2022/2022-05-17_presentationTest/slides/img/add-root-folder.png differ diff --git a/2022/2022-05-17_presentationTest/slides/img/addProject.png b/2022/2022-05-17_presentationTest/slides/img/addProject.png new file mode 100644 index 0000000000000000000000000000000000000000..aa8b6be1bdd10bf68f6691d21c9c4d5095c323c9 Binary files /dev/null and b/2022/2022-05-17_presentationTest/slides/img/addProject.png differ diff --git a/2022/2022-05-17_presentationTest/slides/img/branch.png b/2022/2022-05-17_presentationTest/slides/img/branch.png new file mode 100644 index 0000000000000000000000000000000000000000..00946f3ea8bf2075a6ec9ee61cf91a15835b4db5 Binary files /dev/null and b/2022/2022-05-17_presentationTest/slides/img/branch.png differ diff --git a/2022/2022-05-17_presentationTest/slides/img/clone-SSH.png b/2022/2022-05-17_presentationTest/slides/img/clone-SSH.png new file mode 100644 index 0000000000000000000000000000000000000000..510730814e2819cab2bd6fb42be98ba3fcd79eb9 Binary files /dev/null and b/2022/2022-05-17_presentationTest/slides/img/clone-SSH.png differ diff --git a/2022/2022-05-17_presentationTest/slides/img/commit.png b/2022/2022-05-17_presentationTest/slides/img/commit.png new file mode 100644 index 0000000000000000000000000000000000000000..30aab331f54452e202014be4005b466af2e6eb17 Binary files /dev/null and b/2022/2022-05-17_presentationTest/slides/img/commit.png differ diff --git a/2022/2022-05-17_presentationTest/slides/img/firstrun-source-control.png b/2022/2022-05-17_presentationTest/slides/img/firstrun-source-control.png new file mode 100644 index 0000000000000000000000000000000000000000..2d554c668e9e168a7f9cd95da6c34e598c71144c Binary files /dev/null and b/2022/2022-05-17_presentationTest/slides/img/firstrun-source-control.png differ diff --git a/2022/2022-05-17_presentationTest/slides/img/hero.png b/2022/2022-05-17_presentationTest/slides/img/hero.png new file mode 100644 index 0000000000000000000000000000000000000000..287215bbe3511ee4f73575ed44c290e510a03904 Binary files /dev/null and b/2022/2022-05-17_presentationTest/slides/img/hero.png differ diff --git a/2022/2022-05-17_presentationTest/slides/img/newBranch.png b/2022/2022-05-17_presentationTest/slides/img/newBranch.png new file mode 100644 index 0000000000000000000000000000000000000000..eb1359b1f43b81f146d99c132d7f44290ed6ab8b Binary files /dev/null and b/2022/2022-05-17_presentationTest/slides/img/newBranch.png differ diff --git a/2022/2022-05-17_presentationTest/slides/img/newBranchSwitched.png b/2022/2022-05-17_presentationTest/slides/img/newBranchSwitched.png new file mode 100644 index 0000000000000000000000000000000000000000..38b6840cf7bddf75ed029fa27312decc8b98e464 Binary files /dev/null and b/2022/2022-05-17_presentationTest/slides/img/newBranchSwitched.png differ diff --git a/2022/2022-05-17_presentationTest/slides/img/publish.png b/2022/2022-05-17_presentationTest/slides/img/publish.png new file mode 100644 index 0000000000000000000000000000000000000000..8d295d2b8732dd1f481b6a4fc92551e37a300778 Binary files /dev/null and b/2022/2022-05-17_presentationTest/slides/img/publish.png differ diff --git a/2022/2022-05-17_presentationTest/slides/img/push.png b/2022/2022-05-17_presentationTest/slides/img/push.png new file mode 100644 index 0000000000000000000000000000000000000000..d26c3680b4f6ba36673881f245936eeaf41ccb01 Binary files /dev/null and b/2022/2022-05-17_presentationTest/slides/img/push.png differ diff --git a/2022/2022-05-17_presentationTest/slides/list.json b/2022/2022-05-17_presentationTest/slides/list.json index 8dd5e4ac61faceb7eb91c714f541e6a8a1c8d3c3..bbd679840429f77c66f5cc518fb3ad6cac8583e2 100644 --- a/2022/2022-05-17_presentationTest/slides/list.json +++ b/2022/2022-05-17_presentationTest/slides/list.json @@ -2,9 +2,15 @@ { "filename": "index.md" }, { "filename": "overview.md" }, { "filename": "why.md" }, + { "filename": "workflow.md" }, { "filename": "fork.md" }, + { "filename": "VSCodeGUI.md" }, { "filename": "clone.md" }, { "filename": "add-to-workspace.md" }, + { "filename": "branch.md" }, + { "filename": "commit.md" }, + { "filename": "push.md" }, + { "filename": "merge.md" }, { "filename": "ssh.md" }, { "filename": "test.md" }, { "filename": "thanks.md" } diff --git a/2022/2022-05-17_presentationTest/slides/merge.md b/2022/2022-05-17_presentationTest/slides/merge.md new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/2022/2022-05-17_presentationTest/slides/push.md b/2022/2022-05-17_presentationTest/slides/push.md new file mode 100644 index 0000000000000000000000000000000000000000..04da51cae1b2ad1a13d7f660cac7daa9473e93c0 --- /dev/null +++ b/2022/2022-05-17_presentationTest/slides/push.md @@ -0,0 +1,11 @@ +# Save your changes to server - push them + +Your changes are saved localy. You need to save them on server. In git words: you need to *push them into your fork*. + +If you chreated branch localy, it does not exest on the server. You need to *publish branch* first: + +<img height="230px" src="slides/img/publish.png"> + +For all future changes or when the branch was created online: + +<img height="230px" src="slides/img/push.png"> \ No newline at end of file diff --git a/2022/2022-05-17_presentationTest/slides/workflow.md b/2022/2022-05-17_presentationTest/slides/workflow.md new file mode 100644 index 0000000000000000000000000000000000000000..7bea044a204fe51cab198cd41713bc88a0bf9de7 --- /dev/null +++ b/2022/2022-05-17_presentationTest/slides/workflow.md @@ -0,0 +1,8 @@ +# Typical workflow + +- Create your copy of original repository (*fork* in git words) +- Download your copy to your computer (*clone* in git words) +- Create a new brach +- Make changes +- Commit changes +- Create merge request to original repository \ No newline at end of file