From d29d438f147555572b927602173516bea2d314b6 Mon Sep 17 00:00:00 2001 From: Orestis <orestis.malaspinas@hesge.ch> Date: Sat, 31 Oct 2020 01:03:58 +0100 Subject: [PATCH] a bit of cleaning and adapting for automatic site deploy --- hakyll-bootstrap/Main.hs | 18 +++++++----------- hakyll-bootstrap/index.html | 2 +- hakyll-bootstrap/templates/nav.html | 2 +- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/hakyll-bootstrap/Main.hs b/hakyll-bootstrap/Main.hs index b69f6ee..25ff32b 100644 --- a/hakyll-bootstrap/Main.hs +++ b/hakyll-bootstrap/Main.hs @@ -61,16 +61,12 @@ indexCtx posts = static :: Rules () static = do - match "fonts/*" $ do - route idRoute - compile $ copyFileCompiler - match ("img/*" .||. "img/*/**.png") $ do - route idRoute - compile $ copyFileCompiler - match "css/*" $ do - route idRoute - compile compressCssCompiler - match "js/*" $ do + match ("fonts/*" + .||. "img/*" + .||. "img/*/**.png" + .||. "css/*" + .||. "js/*" + .||. "cours/math_tech_info/figs/*") $ do route idRoute compile $ copyFileCompiler @@ -136,7 +132,7 @@ conc = do cours_mti :: Rules () cours_mti = do - match "cours/math_tech_info/02*.md" $ do + match "cours/math_tech_info/*.markdown" $ do route $ setExtension "html" -- compile $ myPandocCompiler compile $ bibtexCompiler diff --git a/hakyll-bootstrap/index.html b/hakyll-bootstrap/index.html index 446bed6..8772586 100644 --- a/hakyll-bootstrap/index.html +++ b/hakyll-bootstrap/index.html @@ -45,7 +45,7 @@ <div class="carousel-caption"> <!-- <h1>Live stream</h1> <p>Checkout if I'm live</p> --> - <p><a class="btn btn-lg btn-primary" href="https://www.mixer.com/omhepia" role="button">Live stream: Mixer.com</a></p> + <p><a class="btn btn-lg btn-primary" href="https://www.twitch.tv/omhepia" role="button">Live stream: Twitch.tv</a></p> </div> </div> </div> diff --git a/hakyll-bootstrap/templates/nav.html b/hakyll-bootstrap/templates/nav.html index 34eaf19..4dc7a29 100644 --- a/hakyll-bootstrap/templates/nav.html +++ b/hakyll-bootstrap/templates/nav.html @@ -17,7 +17,7 @@ <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown"> Cours <b class="caret"></b></a> <ul class="dropdown-menu"> - <li><a href="#">Mathématiques en technologie de l'information</a></li> + <li><a href="/math_tech_info.html">Mathématiques en technologie de l'information</a></li> <li><a href="#">Programmation séquentielle en C</a></li> <li><a href="/prog_conc.html">Programmation concurrente</a></li> <li class="divider"></li> -- GitLab