From f617558c6ceb61103e969f2bf8f6a9b729f1ac45 Mon Sep 17 00:00:00 2001 From: Paul-Emmanuel Raoul Date: Thu, 6 Feb 2020 23:29:37 +0000 Subject: [PATCH 01/18] Create a new Jekyll website The structure of the website has been generated using 'jekyll new www.zerowastesgp.fr'. --- 404.html | 24 +++++++ Gemfile | 30 +++++++++ Gemfile.lock | 68 ++++++++++++++++++++ _config.yml | 43 +++++++++++++ _posts/2020-02-06-welcome-to-jekyll.markdown | 25 +++++++ about.md | 18 ++++++ index.md | 6 ++ 7 files changed, 214 insertions(+) create mode 100644 404.html create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 _config.yml create mode 100644 _posts/2020-02-06-welcome-to-jekyll.markdown create mode 100644 about.md create mode 100644 index.md diff --git a/404.html b/404.html new file mode 100644 index 0000000..c472b4e --- /dev/null +++ b/404.html @@ -0,0 +1,24 @@ +--- +layout: default +--- + + + +
+

404

+ +

Page not found :(

+

The requested page could not be found.

+
diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..3a09b03 --- /dev/null +++ b/Gemfile @@ -0,0 +1,30 @@ +source "https://rubygems.org" + +# Hello! This is where you manage which Jekyll version is used to run. +# When you want to use a different version, change it below, save the +# file and run `bundle install`. Run Jekyll with `bundle exec`, like so: +# +# bundle exec jekyll serve +# +# This will help ensure the proper Jekyll version is running. +# Happy Jekylling! +gem "jekyll", "~> 3.8.3" + +# This is the default theme for new Jekyll sites. You may change this to anything you like. +gem "minima", "~> 2.0" + +# If you want to use GitHub Pages, remove the "gem "jekyll"" above and +# uncomment the line below. To upgrade, run `bundle update github-pages`. +# gem "github-pages", group: :jekyll_plugins + +# If you have any plugins, put them here! +group :jekyll_plugins do + gem "jekyll-feed", "~> 0.6" +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +# Performance-booster for watching directories on Windows +gem "wdm", "~> 0.1.0" if Gem.win_platform? + diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..7f0f6eb --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,68 @@ +GEM + remote: https://rubygems.org/ + specs: + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + colorator (1.1.0) + concurrent-ruby (1.1.5) + em-websocket (0.5.1) + eventmachine (>= 0.12.9) + http_parser.rb (~> 0.6.0) + eventmachine (1.2.7) + ffi (1.12.2) + forwardable-extended (2.6.0) + http_parser.rb (0.6.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + jekyll (3.8.6) + addressable (~> 2.4) + colorator (~> 1.0) + em-websocket (~> 0.5) + i18n (~> 0.7) + jekyll-sass-converter (~> 1.0) + jekyll-watch (~> 2.0) + kramdown (~> 1.14) + liquid (~> 4.0) + mercenary (~> 0.3.3) + pathutil (~> 0.9) + rouge (>= 1.7, < 4) + safe_yaml (~> 1.0) + jekyll-feed (0.13.0) + jekyll (>= 3.7, < 5.0) + jekyll-sass-converter (1.5.2) + sass (~> 3.4) + jekyll-seo-tag (2.6.1) + jekyll (>= 3.3, < 5.0) + jekyll-watch (2.2.1) + listen (~> 3.0) + kramdown (1.17.0) + liquid (4.0.3) + listen (3.2.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + mercenary (0.3.6) + minima (2.5.1) + jekyll (>= 3.5, < 5.0) + jekyll-feed (~> 0.9) + jekyll-seo-tag (~> 2.1) + pathutil (0.16.2) + forwardable-extended (~> 2.6) + public_suffix (4.0.3) + rb-fsevent (0.10.3) + rb-inotify (0.10.1) + ffi (~> 1.0) + rouge (3.15.0) + safe_yaml (1.0.5) + sass (3.7.4) + +PLATFORMS + ruby + +DEPENDENCIES + jekyll (~> 3.8.3) + jekyll-feed (~> 0.6) + minima (~> 2.0) + tzinfo-data + +BUNDLED WITH + 1.17.3 diff --git a/_config.yml b/_config.yml new file mode 100644 index 0000000..f91333e --- /dev/null +++ b/_config.yml @@ -0,0 +1,43 @@ +# Welcome to Jekyll! +# +# This config file is meant for settings that affect your whole blog, values +# which you are expected to set up once and rarely edit after that. If you find +# yourself editing this file very often, consider using Jekyll's data files +# feature for the data you need to update frequently. +# +# For technical reasons, this file is *NOT* reloaded automatically when you use +# 'bundle exec jekyll serve'. If you change this file, please restart the server process. + +# Site settings +# These are used to personalize your new site. If you look in the HTML files, +# you will see them accessed via {{ site.title }}, {{ site.email }}, and so on. +# You can create any custom variable you would like, and they will be accessible +# in the templates via {{ site.myvariable }}. +title: Your awesome title +email: your-email@example.com +description: >- # this means to ignore newlines until "baseurl:" + Write an awesome description for your new site here. You can edit this + line in _config.yml. It will appear in your document head meta (for + Google search results) and in your feed.xml site description. +baseurl: "" # the subpath of your site, e.g. /blog +url: "" # the base hostname & protocol for your site, e.g. http://example.com +twitter_username: jekyllrb +github_username: jekyll + +# Build settings +markdown: kramdown +theme: minima +plugins: + - jekyll-feed + +# Exclude from processing. +# The following items will not be processed, by default. Create a custom list +# to override the default setting. +# exclude: +# - Gemfile +# - Gemfile.lock +# - node_modules +# - vendor/bundle/ +# - vendor/cache/ +# - vendor/gems/ +# - vendor/ruby/ diff --git a/_posts/2020-02-06-welcome-to-jekyll.markdown b/_posts/2020-02-06-welcome-to-jekyll.markdown new file mode 100644 index 0000000..0509aa0 --- /dev/null +++ b/_posts/2020-02-06-welcome-to-jekyll.markdown @@ -0,0 +1,25 @@ +--- +layout: post +title: "Welcome to Jekyll!" +date: 2020-02-06 23:19:02 +0000 +categories: jekyll update +--- +You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `jekyll serve`, which launches a web server and auto-regenerates your site when a file is updated. + +To add new posts, simply add a file in the `_posts` directory that follows the convention `YYYY-MM-DD-name-of-post.ext` and includes the necessary front matter. Take a look at the source for this post to get an idea about how it works. + +Jekyll also offers powerful support for code snippets: + +{% highlight ruby %} +def print_hi(name) + puts "Hi, #{name}" +end +print_hi('Tom') +#=> prints 'Hi, Tom' to STDOUT. +{% endhighlight %} + +Check out the [Jekyll docs][jekyll-docs] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekyll’s GitHub repo][jekyll-gh]. If you have questions, you can ask them on [Jekyll Talk][jekyll-talk]. + +[jekyll-docs]: https://jekyllrb.com/docs/home +[jekyll-gh]: https://github.com/jekyll/jekyll +[jekyll-talk]: https://talk.jekyllrb.com/ diff --git a/about.md b/about.md new file mode 100644 index 0000000..8b4e0b2 --- /dev/null +++ b/about.md @@ -0,0 +1,18 @@ +--- +layout: page +title: About +permalink: /about/ +--- + +This is the base Jekyll theme. You can find out more info about customizing your Jekyll theme, as well as basic Jekyll usage documentation at [jekyllrb.com](https://jekyllrb.com/) + +You can find the source code for Minima at GitHub: +[jekyll][jekyll-organization] / +[minima](https://github.com/jekyll/minima) + +You can find the source code for Jekyll at GitHub: +[jekyll][jekyll-organization] / +[jekyll](https://github.com/jekyll/jekyll) + + +[jekyll-organization]: https://github.com/jekyll diff --git a/index.md b/index.md new file mode 100644 index 0000000..0671507 --- /dev/null +++ b/index.md @@ -0,0 +1,6 @@ +--- +# Feel free to add content and custom Front Matter to this file. +# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults + +layout: home +--- From cda0b7b641752bb5997a5cb9040f564550826d74 Mon Sep 17 00:00:00 2001 From: Paul-Emmanuel Raoul Date: Fri, 7 Feb 2020 00:12:27 +0000 Subject: [PATCH 02/18] Update website's configuration --- _config.yml | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/_config.yml b/_config.yml index f91333e..f7c6f24 100644 --- a/_config.yml +++ b/_config.yml @@ -1,28 +1,16 @@ -# Welcome to Jekyll! -# -# This config file is meant for settings that affect your whole blog, values -# which you are expected to set up once and rarely edit after that. If you find -# yourself editing this file very often, consider using Jekyll's data files -# feature for the data you need to update frequently. -# -# For technical reasons, this file is *NOT* reloaded automatically when you use -# 'bundle exec jekyll serve'. If you change this file, please restart the server process. - # Site settings -# These are used to personalize your new site. If you look in the HTML files, -# you will see them accessed via {{ site.title }}, {{ site.email }}, and so on. -# You can create any custom variable you would like, and they will be accessible -# in the templates via {{ site.myvariable }}. -title: Your awesome title -email: your-email@example.com +title: Zero Waste Sud Grand Paris +email: sudgrandparis@zerowastefrance.org description: >- # this means to ignore newlines until "baseurl:" - Write an awesome description for your new site here. You can edit this - line in _config.yml. It will appear in your document head meta (for - Google search results) and in your feed.xml site description. + Groupe local de Zero Waste France opérant sur le bassin sud-ouest + du grand Paris (Malakoff, Vanves, Issy-Les-Moulineaux, Montrouge, + Chatillon, Clamart). baseurl: "" # the subpath of your site, e.g. /blog -url: "" # the base hostname & protocol for your site, e.g. http://example.com -twitter_username: jekyllrb -github_username: jekyll +url: "https://www.zerowastesgp.fr" # the base hostname & protocol for your site, e.g. http://example.com +github_username: zerowastesgp +facebook_username: ZeroWasteSudGrandParis +instagram_username: zerowaste_sudgrandparis +email: sudgrandparis@zerowastefrance.org # Build settings markdown: kramdown From 926551017190ae8efe45e8c0c957cc83079d003c Mon Sep 17 00:00:00 2001 From: Paul-Emmanuel Raoul Date: Fri, 7 Feb 2020 01:50:26 +0000 Subject: [PATCH 03/18] Set up the default layout --- _includes/head.html | 12 ++++++++++++ _layouts/default.html | 9 +++++++++ index.md | 36 ++++++++++++++++++++++++++++++++---- 3 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 _includes/head.html create mode 100644 _layouts/default.html diff --git a/_includes/head.html b/_includes/head.html new file mode 100644 index 0000000..d5ef0ec --- /dev/null +++ b/_includes/head.html @@ -0,0 +1,12 @@ + + +{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %} + + + +{% if site.favicon_img %} + +{% endif %} + + + diff --git a/_layouts/default.html b/_layouts/default.html new file mode 100644 index 0000000..3b07842 --- /dev/null +++ b/_layouts/default.html @@ -0,0 +1,9 @@ + + + + {% include head.html %} + + + {{ content }} + + diff --git a/index.md b/index.md index 0671507..65498ab 100644 --- a/index.md +++ b/index.md @@ -1,6 +1,34 @@ --- -# Feel free to add content and custom Front Matter to this file. -# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults - -layout: home +layout: default +permalink: / --- +
+ {% if site.front_img %} + + {% endif %} + + {% if site.avatar %} + + {% endif %} + +

{{ site.name }}

+

{{ site.description }}

+ +
    + {% if site.github_username %} +
  • GitHub
    • + {% endif %} + + {% if site.facebook_username %} +
  • Facebook
    • + {% endif %} + + {% if site.instagram_username %} +
  • Instagram
    • + {% endif %} + + {% if site.email %} +
  • Email
    • + {% endif %} +
+
From 8513c90ab3400d5c128bcd7b67ec25f0b02d35f5 Mon Sep 17 00:00:00 2001 From: Paul-Emmanuel Raoul Date: Fri, 7 Feb 2020 01:51:43 +0000 Subject: [PATCH 04/18] Delete 'about.md' --- about.md | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 about.md diff --git a/about.md b/about.md deleted file mode 100644 index 8b4e0b2..0000000 --- a/about.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -layout: page -title: About -permalink: /about/ ---- - -This is the base Jekyll theme. You can find out more info about customizing your Jekyll theme, as well as basic Jekyll usage documentation at [jekyllrb.com](https://jekyllrb.com/) - -You can find the source code for Minima at GitHub: -[jekyll][jekyll-organization] / -[minima](https://github.com/jekyll/minima) - -You can find the source code for Jekyll at GitHub: -[jekyll][jekyll-organization] / -[jekyll](https://github.com/jekyll/jekyll) - - -[jekyll-organization]: https://github.com/jekyll From dbdced25f591741c696dfe700f8de7df9f50f66b Mon Sep 17 00:00:00 2001 From: Paul-Emmanuel Raoul Date: Fri, 7 Feb 2020 01:52:12 +0000 Subject: [PATCH 05/18] Delete the default post --- _posts/2020-02-06-welcome-to-jekyll.markdown | 25 -------------------- 1 file changed, 25 deletions(-) delete mode 100644 _posts/2020-02-06-welcome-to-jekyll.markdown diff --git a/_posts/2020-02-06-welcome-to-jekyll.markdown b/_posts/2020-02-06-welcome-to-jekyll.markdown deleted file mode 100644 index 0509aa0..0000000 --- a/_posts/2020-02-06-welcome-to-jekyll.markdown +++ /dev/null @@ -1,25 +0,0 @@ ---- -layout: post -title: "Welcome to Jekyll!" -date: 2020-02-06 23:19:02 +0000 -categories: jekyll update ---- -You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `jekyll serve`, which launches a web server and auto-regenerates your site when a file is updated. - -To add new posts, simply add a file in the `_posts` directory that follows the convention `YYYY-MM-DD-name-of-post.ext` and includes the necessary front matter. Take a look at the source for this post to get an idea about how it works. - -Jekyll also offers powerful support for code snippets: - -{% highlight ruby %} -def print_hi(name) - puts "Hi, #{name}" -end -print_hi('Tom') -#=> prints 'Hi, Tom' to STDOUT. -{% endhighlight %} - -Check out the [Jekyll docs][jekyll-docs] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekyll’s GitHub repo][jekyll-gh]. If you have questions, you can ask them on [Jekyll Talk][jekyll-talk]. - -[jekyll-docs]: https://jekyllrb.com/docs/home -[jekyll-gh]: https://github.com/jekyll/jekyll -[jekyll-talk]: https://talk.jekyllrb.com/ From bff9e29ef0d88393f71849b25527f8e4699d9f9c Mon Sep 17 00:00:00 2001 From: Paul-Emmanuel Raoul Date: Fri, 7 Feb 2020 01:52:39 +0000 Subject: [PATCH 06/18] Change the order of the social icons --- index.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.md b/index.md index 65498ab..a36347b 100644 --- a/index.md +++ b/index.md @@ -15,10 +15,6 @@ permalink: /

{{ site.description }}