From 8eb28e3aadfbc6defe76fcaeb97a5334ff9e61a6 Mon Sep 17 00:00:00 2001 From: Capucinoxx Date: Fri, 1 Sep 2023 16:10:52 -0400 Subject: [PATCH 1/7] chore: add docker-compose --- Gemfile | 2 +- Gemfile.lock | 5 +---- docker-compose.yml | 12 ++++++++++++ 3 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 docker-compose.yml diff --git a/Gemfile b/Gemfile index 9d2f64d..53144b3 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ source "https://rubygems.org" # # This will help ensure the proper Jekyll version is running. # Happy Jekylling! -gem "jekyll", "~> 3.8.4" +# gem "jekyll", "~> 3.8.4" # This is the default theme for new Jekyll sites. You may change this to anything you like. gem "minima", "~> 2.0" diff --git a/Gemfile.lock b/Gemfile.lock index 3fc603b..dbd856b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -68,7 +68,6 @@ GEM concurrent-ruby (~> 1.0) tzinfo-data (1.2019.3) tzinfo (>= 1.0.0) - wdm (0.1.1) PLATFORMS ruby @@ -76,11 +75,9 @@ PLATFORMS x86-mingw32 DEPENDENCIES - jekyll (~> 3.8.4) jekyll-feed (~> 0.6) minima (~> 2.0) tzinfo-data - wdm (~> 0.1.0) BUNDLED WITH - 1.17.2 + 1.17.3 diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..058f9bb --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.9' + +services: + web: + image: 'jekyll/jekyll:3.8' + volumes: + - '.:/app' + working_dir: '/app' + ports: + - '10529:4000' + - '35729:35729' + command: 'jekyll serve --livereload' \ No newline at end of file From b17f49ebec1684415a959734ea31dcb5f4a53997 Mon Sep 17 00:00:00 2001 From: Capucinoxx Date: Fri, 1 Sep 2023 16:22:36 -0400 Subject: [PATCH 2/7] chore: update contribution --- .github/CONTRIBUTING.md | 40 ++++++++++++++++++++++++++++++++++++++++ README.md | 29 +++-------------------------- 2 files changed, 43 insertions(+), 26 deletions(-) create mode 100644 .github/CONTRIBUTING.md diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md new file mode 100644 index 0000000..7b4c494 --- /dev/null +++ b/.github/CONTRIBUTING.md @@ -0,0 +1,40 @@ +# Contribution au site JDIS + +## Démarrage rapide + +1. Forker le projet +![fork a repo](https://docs.github.com/assets/cb-79331/images/help/repository/fork_button.png) + +2. Cloner le dépôt forké +```bash +git clone https://github.com/${your_username}/Website +``` + +3. Configurer le dépôt distant (upstream) +```bash +git remote add upstream https://github.com/JDIS/Website +``` + +4. Assurez-vous de récupérer les dernières modifications de l'upstream +```bash +git pull upstream main +git push origin main # to update your remote fork +``` + +5. Crée une branche séparée +```bash +git checkout -a feat/${name_of_your_modification} +``` + +6. Effectuer les modifications + +7. Ajouter les nouveaux fichiers modifiers + +8. Effectuer un commit de vos modifications + +7. Pousser vos modifications +```bash +git push origin feat/${name_of_your_modification} +``` + +10. Cr/er une pull request sur Github \ No newline at end of file diff --git a/README.md b/README.md index efeb214..9cddc08 100644 --- a/README.md +++ b/README.md @@ -4,36 +4,13 @@ Ce dépôt contient les ressources du site web public de JDIS, accessible à l'a ## Pour démarrer le projet -### 1. Installer les dépendances globales - -Vous devez installer [Ruby](https://www.ruby-lang.org/fr/documentation/installation/). - -Une fois que Ruby est installé, vous devez installer Bundler : - -```sh -gem install bundler -``` - -### 2. Cloner le dépôt - ```sh -git clone git@github.com:JDIS/Website.git && cd Website +docker-compose up ``` -### 3. Installer les dépendances du projet - -```sh -bundle install -``` - -### 4. Démarrer le serveur - -```sh -bundle exec jekyll serve -``` +Le site web devrait être disponible localement à l'adresse suivante: . -Le site web devrait être disponible localement à l'adresse suivante: . ## Pour contribuer -Vos contributions sont les bienvenues. Que ce soit pour ajouter un événement, une photo ou une information, vous pouvez créer une _pull request_ depuis la branche qui contient vos modifications. +Vos contributions sont les bienvenues. Merci de [suivre le guide de contribution](./.github/CONTRIBUTING.md) From b36fdac5d02544f4372e655eadc052b943af64bb Mon Sep 17 00:00:00 2001 From: Benjamin Courchesne <42392217+Capucinoxx@users.noreply.github.com> Date: Sat, 2 Nov 2024 15:07:18 -0400 Subject: [PATCH 3/7] Update .github/CONTRIBUTING.md --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 7b4c494..65b1b92 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -18,7 +18,7 @@ git remote add upstream https://github.com/JDIS/Website 4. Assurez-vous de récupérer les dernières modifications de l'upstream ```bash git pull upstream main -git push origin main # to update your remote fork +git push origin master # to update your remote fork ``` 5. Crée une branche séparée From c1a98178df71704bab9342b220ec79aa33f22f07 Mon Sep 17 00:00:00 2001 From: Benjamin Courchesne <42392217+Capucinoxx@users.noreply.github.com> Date: Sat, 2 Nov 2024 15:07:25 -0400 Subject: [PATCH 4/7] Update .github/CONTRIBUTING.md --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 65b1b92..daa572e 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -23,7 +23,7 @@ git push origin master # to update your remote fork 5. Crée une branche séparée ```bash -git checkout -a feat/${name_of_your_modification} +git checkout -b feat/${name_of_your_modification} ``` 6. Effectuer les modifications From 08067f5d854092e1e5b5fff2d35da59311ebf1da Mon Sep 17 00:00:00 2001 From: Benjamin Courchesne <42392217+Capucinoxx@users.noreply.github.com> Date: Sat, 2 Nov 2024 15:08:44 -0400 Subject: [PATCH 5/7] Update .github/CONTRIBUTING.md --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index daa572e..cadca9a 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -37,4 +37,4 @@ git checkout -b feat/${name_of_your_modification} git push origin feat/${name_of_your_modification} ``` -10. Cr/er une pull request sur Github \ No newline at end of file +10. Créer une pull request sur Github \ No newline at end of file From 86335d182fee2076e4c7f0941caebc7a136c52ea Mon Sep 17 00:00:00 2001 From: Benjamin Courchesne <42392217+Capucinoxx@users.noreply.github.com> Date: Sat, 2 Nov 2024 15:36:24 -0400 Subject: [PATCH 6/7] Update .github/CONTRIBUTING.md --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index cadca9a..4c919bf 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -7,7 +7,7 @@ 2. Cloner le dépôt forké ```bash -git clone https://github.com/${your_username}/Website +git clone https://github.com/${your_username}/Website.git ``` 3. Configurer le dépôt distant (upstream) From 7c1bb3348a41e0e1a0bd1d05a5d9b1fd60d019ca Mon Sep 17 00:00:00 2001 From: Benjamin Courchesne <42392217+Capucinoxx@users.noreply.github.com> Date: Sat, 2 Nov 2024 15:36:38 -0400 Subject: [PATCH 7/7] Update .github/CONTRIBUTING.md --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 4c919bf..4a15113 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -12,7 +12,7 @@ git clone https://github.com/${your_username}/Website.git 3. Configurer le dépôt distant (upstream) ```bash -git remote add upstream https://github.com/JDIS/Website +git remote add upstream https://github.com/JDIS/Website.git ``` 4. Assurez-vous de récupérer les dernières modifications de l'upstream