From a513f43ab75631bf67f4fe2e4c0da578a85906d4 Mon Sep 17 00:00:00 2001 From: "Thomas \"Cakeisalie5\" Touhey" Date: Fri, 1 Jun 2018 10:34:53 +0200 Subject: [PATCH] =?UTF-8?q?Ajout=20du=20compte-rendu=20de=20l'AGE=20du=203?= =?UTF-8?q?1=20mai=202018,=20correction=20de=20divers=20=C3=A9l=C3=A9ments?= =?UTF-8?q?=20techniques.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++ Gemfile | 21 +-------- Makefile | 35 ++++++++------- README.md | 27 +++++++----- assets/style.css => _assets/css/main.scss | 19 ++++++-- {assets => _assets/fonts}/noto_sans.ttf | Bin {assets => _assets/fonts}/raleway_200.ttf | Bin {assets => _assets/fonts}/raleway_300.ttf | Bin _config.yml | 51 +++++++++++++++------- _data/authors.yml | 4 ++ _includes/meta.html | 2 +- _layouts/default.html | 2 +- _posts/2018-05-31-age-mai-2018.md | 13 ++++++ files/2018-05-31-AGE.pdf | Bin 0 -> 1032446 bytes 14 files changed, 111 insertions(+), 66 deletions(-) rename assets/style.css => _assets/css/main.scss (83%) rename {assets => _assets/fonts}/noto_sans.ttf (100%) rename {assets => _assets/fonts}/raleway_200.ttf (100%) rename {assets => _assets/fonts}/raleway_300.ttf (100%) create mode 100644 _posts/2018-05-31-age-mai-2018.md create mode 100644 files/2018-05-31-AGE.pdf diff --git a/.gitignore b/.gitignore index 51034dc..7a468df 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,9 @@ Gemfile.lock _site .sass-cache .jekyll-metadata +.jekyll-cache +vendor +.bundle .DS_Store .*.swp diff --git a/Gemfile b/Gemfile index 8af2673..55b40ea 100644 --- a/Gemfile +++ b/Gemfile @@ -1,28 +1,11 @@ source "https://rubygems.org" ruby RUBY_VERSION -# 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.4.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! +gem "jekyll", "3.7.0" group :jekyll_plugins do gem "jekyll-feed", "~> 0.6" + gem "jekyll-assets" end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] - diff --git a/Makefile b/Makefile index f673687..eaee710 100755 --- a/Makefile +++ b/Makefile @@ -1,29 +1,34 @@ #!/usr/bin/make -f -#*****************************************************************************# -# Targets for the end user, which is me. # -#*****************************************************************************# -# Preview in local how it will render. +# The role of this Makefile is to make the commands accessible to the +# developer that may not know Jekyll that well. +# --- +# Here are the commands the developer should use: +# +# — Preview (run a local webserver and update automatically when a change is +# made to view the modifications before pushing them to the server). + preview prev: -all-watch -.PHONY: preview prev -#*****************************************************************************# -# Internal rules # -#*****************************************************************************# +# --- +# Internal rules. +# --- + BUNDLE := bundle JEK := $(BUNDLE) exec jekyll -# Prepare. +# Prepare the build by installing the modules that aren't installed to +# the local `vendor/` folder to avoid conflicts. + -prepare: $(BUNDLE) check || $(BUNDLE) install --path vendor/bundle + $(BUNDLE) update -# Make it all. - -all: -prepare - $(JEK) build +# Make the website for different contexts. -# Make the drafts and watch. -all-watch: -prepare $(JEK) serve --drafts --watch -.PHONY: -prepare -.PHONY: -all -all-watch +.PHONY: preview prev show +.PHONY: -prepare -all -all-watch + # End of file. diff --git a/README.md b/README.md index 9e132d5..15520c2 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,26 @@ # Portail web de CreativeCalc Ceci est le (simple) portail web de [CreativeCalc](http://creativecalc.fr/), l'association derrière [Planète Casio](https://www.planet-casio.com). -Il est construit avec Jekyll 3.4.3. +Il est construit avec Jekyll. -## Instructions de développement +## Développement du site +Il vous faudra installer Ruby et Bundle. Pour visualiser en local et en +direct les changements que vous faites, il vous faudra faire la commande +suivante : -Commencez par [Installer Jekyll](https://jekyllrb.com/docs/installation/). -Voici quelques commandes pour vous mettre bien (sous UNIX-like) : + make preview - # Installation des dépendances - bundle check || bundle install - - # Construction du site (le résultat sera dans `_site/`) - bundle exec jekyll build - - # Pour visualiser en direct les modifications - bundle exec jekyll serve --watch +Le résultat sera disponible sur `localhost:4000` (ou `127.0.0.1:4000` si +vous préférez), et sera automatiquement mis à jour lorsque vous éditez un +fichier faisant partie du projet (excepté la configuration, il vous faudra +relancer la prévisualisation pour cela). ## Production +Pour des raisons de tracabilité, les contributeurs de ce site ne sont pas +censés mettre à jour le site directement, il faut pour cela téléverser vos +modifications sur le dépôt git de base (présent sur CreativeCalc) et demander +à un serveur, que l'on nomme l'`adm`, de mettre à jour le site à partir de +ce qu'il y a sur ce dépôt. Si vous n'avez pas de double de clés SSH, faites-en un avec `ssh-keygen` (votre moteur de recherche favori vous renseignera). diff --git a/assets/style.css b/_assets/css/main.scss similarity index 83% rename from assets/style.css rename to _assets/css/main.scss index 668c984..e19f4ba 100644 --- a/assets/style.css +++ b/_assets/css/main.scss @@ -2,9 +2,22 @@ Fonts */ -@font-face { font-family: NotoSans; src: url(/assets/noto_sans.ttf); } -@font-face { font-family: Raleway; font-weight: 200; src: url(/assets/raleway_200.ttf); } -@font-face { font-family: Raleway; font-weight: 300; src: url(/assets/raleway_300.ttf); } +@font-face { + font-family: NotoSans; + src: asset_url("fonts/noto_sans.ttf"); +} + +@font-face { + font-family: Raleway; + font-weight: 200; + src: asset_url("fonts/raleway_200.ttf"); +} + +@font-face { + font-family: Raleway; + font-weight: 300; + src: asset_url("fonts/raleway_300.ttf"); +} /* diff --git a/assets/noto_sans.ttf b/_assets/fonts/noto_sans.ttf similarity index 100% rename from assets/noto_sans.ttf rename to _assets/fonts/noto_sans.ttf diff --git a/assets/raleway_200.ttf b/_assets/fonts/raleway_200.ttf similarity index 100% rename from assets/raleway_200.ttf rename to _assets/fonts/raleway_200.ttf diff --git a/assets/raleway_300.ttf b/_assets/fonts/raleway_300.ttf similarity index 100% rename from assets/raleway_300.ttf rename to _assets/fonts/raleway_300.ttf diff --git a/_config.yml b/_config.yml index 599fe51..85e0166 100644 --- a/_config.yml +++ b/_config.yml @@ -1,23 +1,44 @@ -# 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 }}. +#****************************************************************************** +# _config.yml — website configuration. +# This file is **NOT** reloaded while previewing. +#****************************************************************************** +encoding: UTF-8 + +# Website settings. + +url: https://www.creativecalc.fr +baseurl: "" title: CreativeCalc author: creativecalc description: >- - CreativeCalc est une association à but non lucratif promouvant l'apprentissage - de la programmation. -baseurl: "" -url: "https://www.creativecalc.fr" -twitter_username: PlaneteCasio -github_username: PlaneteCasio + CreativeCalc est une association à but non lucratif promouvant + l'apprentissage de la programmation. -# Build settings -markdown: kramdown -theme: minima -gems: +# Folders and files. + +plugins: - jekyll-feed + - jekyll-assets exclude: - Gemfile - Gemfile.lock + - vendor + - Makefile + - README.md + +# Markdown settings. + +markdown: kramdown +highlighter: rouge + +# Assets settings. +assets: + source_maps: false + compress: + css: false + js: false + digest: true + sources: + - _assets + +# End of file. diff --git a/_data/authors.yml b/_data/authors.yml index 00fdc64..6d04e0e 100644 --- a/_data/authors.yml +++ b/_data/authors.yml @@ -4,6 +4,8 @@ creativecalc: born: 2015-04-29T00:00:00+01:00 website: https://creativecalc.fr email: contact@creativecalc.fr + twitter: PlaneteCasio + github: PlaneteCasio darks: name: @@ -14,6 +16,7 @@ darks: born: 1996-11-03T00:00:00+01:00 website: https://blog.darks.fr/ email: l.gatin@protonmail.com + lephenixnoir: name: first_name: Sébastien @@ -23,6 +26,7 @@ lephenixnoir: born: 1999-11-26T00:00:00+01:00 website: http://www.planet-casio.com/Fr/compte/voir_profil.php?membre=Lephenixnoir email: sebastien.mld@numericable.fr + cakeisalie5: name: first_name: Thomas diff --git a/_includes/meta.html b/_includes/meta.html index c6562ab..1c08e7b 100644 --- a/_includes/meta.html +++ b/_includes/meta.html @@ -30,7 +30,7 @@ -{% if page.lay2017/07/10/reunion-ca.htmlout == "post" +{% if page.layout == "post" %} {% if author.name.first_name diff --git a/_layouts/default.html b/_layouts/default.html index 1ffac13..f049a1c 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -4,7 +4,7 @@ {% include meta.html %} - +{% asset css/main.css %}