diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8919044 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +ticket_matilde.jpg \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d0b1c4d --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2026 Lotte Pohl + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md index f9942c9..73ed0b5 100644 --- a/README.md +++ b/README.md @@ -1,49 +1,11 @@ -# Micro-credentials Project +# Project GentJazz20206 +*by Matilde and Lotte* -If you found this repository and is not registered in [our micro-credential](https://studiekiezer.ugent.be/2025/micro-credential-reproducible-data-analysis-an-essential-capability-in-modern-science-en) please read more in the last topic. +## Folder Structure +We got inspiration for the folder structure of this project on the following article: https://medium.com/@boubkerelmaayouf/the-ultimate-folder-structure-guide-for-any-project-any-language-6bb5b8fbd5b3 -You should **fork this repository** and in collaboration with a colleague that is also part of the micro-credential course. You develop the project together. -The project is simple, and consists of creating a repository for documenting concepts, best practices, examples and a cheat-sheet on using Git & GitHub. +- **doc**: In this folder we store documents (.md files) with useful information about GentJazz +- **res**: Folder to store images and other multimedia resources +- **tools**: Since this is an experimental project, in this folder some useful information about Git and GitHub workarounds are kept, namely a file called 'Cheatsheet.md' with useful commands. -Your repository must contain a **folder structure, a README file, a gitignore file, a license**. All files must be developed in markdown (MD), you can find more information about [MD here](https://www.markdownguide.org/cheat-sheet/) and about [Liascript](https://liascript.github.io/), a MD dialect. You can add images and printscreens if you want. - - **Think about and inform yourself via internet resources about a useful folder structure in the repository, and cite your sources (2,3, as you see fit)**. - - -Define the your collaboration strategy considering: ----------------------------------------------------- - -1. Both should work in different branches - - a. A minimum of 3 branches must be available (main, partner1 and partner2), if necessary more branches can be created. - - b. The delivered project should be the final merged version. - - c. You can merge directly or using branch pull request if you want someone to review. - -2. A minimum of 10 commits per person must be seen in the history. - -3. You need to have at least two solved conflicts in the history, one by each person. - -4. You need to revert at least on commit. - -5. Include examples in your documents, you can decide where and how this fits better. - -6. Search for other Git commands, that were not introduced in the course, choose one or more that you agree could be useful in your work and include in the documentation. - -7. You must have at least one tag in your project. - -8. Review and communicate with each other using GitHub-issues. - -9. Work as much as possible using command line. - -Delivery ------------ - -Once with the final version you must make a pull request to this repository. - - -**Micro-credential |** Reproducible Data Analysis: an Essential Capability in Modern Science -------------------------------------------------------------------------------------------------- - -This project is part the first evaluation of the micro-credetial that is offered by [VIB](https://vib.be/en#/) and [UGent](https://www.ugent.be/en) with the aim to improve data analysis reproducbility in science. A micro-credential is like a mini-diploma that you have followed a course and learnd a new skill that is valuable for your carrear. If you are interested to register you can find more detais in the [UGent registration page](https://studiekiezer.ugent.be/2025/micro-credential-reproducible-data-analysis-an-essential-capability-in-modern-science-en). +*Outside these folders live a licence, a gitignore, and also the guidelines for this project ('TASK.md')* \ No newline at end of file diff --git a/TASK.md b/TASK.md new file mode 100644 index 0000000..f9942c9 --- /dev/null +++ b/TASK.md @@ -0,0 +1,49 @@ +# Micro-credentials Project + +If you found this repository and is not registered in [our micro-credential](https://studiekiezer.ugent.be/2025/micro-credential-reproducible-data-analysis-an-essential-capability-in-modern-science-en) please read more in the last topic. + +You should **fork this repository** and in collaboration with a colleague that is also part of the micro-credential course. You develop the project together. +The project is simple, and consists of creating a repository for documenting concepts, best practices, examples and a cheat-sheet on using Git & GitHub. + +Your repository must contain a **folder structure, a README file, a gitignore file, a license**. All files must be developed in markdown (MD), you can find more information about [MD here](https://www.markdownguide.org/cheat-sheet/) and about [Liascript](https://liascript.github.io/), a MD dialect. You can add images and printscreens if you want. + + **Think about and inform yourself via internet resources about a useful folder structure in the repository, and cite your sources (2,3, as you see fit)**. + + +Define the your collaboration strategy considering: +---------------------------------------------------- + +1. Both should work in different branches + + a. A minimum of 3 branches must be available (main, partner1 and partner2), if necessary more branches can be created. + + b. The delivered project should be the final merged version. + + c. You can merge directly or using branch pull request if you want someone to review. + +2. A minimum of 10 commits per person must be seen in the history. + +3. You need to have at least two solved conflicts in the history, one by each person. + +4. You need to revert at least on commit. + +5. Include examples in your documents, you can decide where and how this fits better. + +6. Search for other Git commands, that were not introduced in the course, choose one or more that you agree could be useful in your work and include in the documentation. + +7. You must have at least one tag in your project. + +8. Review and communicate with each other using GitHub-issues. + +9. Work as much as possible using command line. + +Delivery +----------- + +Once with the final version you must make a pull request to this repository. + + +**Micro-credential |** Reproducible Data Analysis: an Essential Capability in Modern Science +------------------------------------------------------------------------------------------------- + +This project is part the first evaluation of the micro-credetial that is offered by [VIB](https://vib.be/en#/) and [UGent](https://www.ugent.be/en) with the aim to improve data analysis reproducbility in science. A micro-credential is like a mini-diploma that you have followed a course and learnd a new skill that is valuable for your carrear. If you are interested to register you can find more detais in the [UGent registration page](https://studiekiezer.ugent.be/2025/micro-credential-reproducible-data-analysis-an-essential-capability-in-modern-science-en). diff --git a/doc/Lineup.md b/doc/Lineup.md new file mode 100644 index 0000000..bc29b6b --- /dev/null +++ b/doc/Lineup.md @@ -0,0 +1,53 @@ +# Gent Jazz Festival 2026 — Lineup by Date + +**Dates:** July 2–18, 2026 +**Venue:** Bijlokehof (Muziekcentrum De Bijloke), Ghent, Belgium +**Edition:** 25th Anniversary + +--- + +## Thursday, July 2 +Lakecia Benjamin, Stanley Clarke N*4Ever, Sun Ra Arkestra, Terence Blanchard + +## Friday, July 3 +Lambert, Angus and Julia Stone, Dressed Like Boys, José González + +## Saturday, July 4 +Curiosity Shop, John Hiatt Solo, Luka Bloom, Suzanne Vega, TP Le Green + +## Sunday, July 5 +Bruno Berle, Rio Kosta, Admiral Freebee, Alabama Shakes, Fatoumata Diawara, Fifty Foot Combo + +## Tuesday, July 7 +Jon Muq, Annie & The Caldwells, Axelle Red, D.K. Harrell, Van Morrison + +## Thursday, July 9 +Patti Smith, Tindersticks, Yasmine Hamdan + +## Friday, July 10 +Josh Johnson, Tomoki Sanders, Charles Lloyd, Marcus Miller | We Want Miles!, Nate Smith, OLA TUNJI, Shabaka + +## Saturday, July 11 +The Milk, Celeste, Mari Froes, Olympia Vitalis + +## Sunday, July 12 +Gala Dragot, Tamino, Ao, MARO + +## Monday, July 13 +John Legend, Lady Linn & Her Magnificent Seven, Samara Joy, Selah Sue and the Gallands + +## Tuesday, July 14 +Ludovico Einaudi + +## Wednesday, July 15 +Ludovico Einaudi *(extra date)* + +## Thursday, July 16 +Darkside, Snarky Puppy, Stavroz + +## Friday, July 17 +Asaf Avidan, Warhaus + +--- + +*Source: [gentjazz.com](https://www.gentjazz.com/en). Schedule can be updated — some days may have additional artists still to be announced.* diff --git a/doc/Tickets.md b/doc/Tickets.md new file mode 100644 index 0000000..e69de29 diff --git a/res/Lineup2025.jpg b/res/Lineup2025.jpg new file mode 100644 index 0000000..d7cd520 Binary files /dev/null and b/res/Lineup2025.jpg differ diff --git a/res/concert_photos/info.md b/res/concert_photos/info.md new file mode 100644 index 0000000..101c949 --- /dev/null +++ b/res/concert_photos/info.md @@ -0,0 +1 @@ +this folder is to later share our concert photos from the Festival! \ No newline at end of file diff --git a/tools/Cheatsheet.md b/tools/Cheatsheet.md new file mode 100644 index 0000000..f3fcf31 --- /dev/null +++ b/tools/Cheatsheet.md @@ -0,0 +1,53 @@ + +# Git commands + +This sheet aggregates useful commands when using git from the command line. + +## Routine commands +``` +git status +git add +git commit -m +``` +## Additional useful commands + +### Creating and checking out of a branch simultaneously + +``` +git checkout -b +``` + +### adding a branch to the remote when pushing it for the first time + +``` +git push --set-upstream origin +``` + +### Git fetch versus git pull + +* `git fetch` downloads the changes from the remote but does not merge them into your working branch. It just updates your remote-tracking refs (e.g. origin/main). You stay on your current code untouched. + +* `git pull` does a fetch and immediately merges (or rebases) the changes into your current branch. It's essentially git fetch + git merge in one step. + +``` +# fetch: safe, just downloads +git fetch origin +git diff main origin/main # inspect what changed before merging +git merge origin/main # merge when you're ready + +# pull: fetch + merge in one go +git pull origin main +``` + +## amend commit +``` +git commit --amend -m "message" +pit push --force # if commit already pushed +``` + +### revert commit with message +``` +git revert --no-commit +git commit -m "commit message" + +``` \ No newline at end of file