Things are compiling nicely finally

1 files changed, 9 insertions, 4 deletions

diff --git a/app/Main.hs b/app/Main.hs
index 155688e..4011995 100644
--- a/app/Main.hs
+++ b/app/Main.hs
@@ -17,7 +17,7 @@ import Hakyll.Aeson (yamlCompiler)
 import Hakyll.Paper (papersCompiler, mkPaperContext, FieldContext (..))
 import Hakyll.TeX.BibTeX (bibtexCompiler)
 import Hakyll.Web.Sass
-import Text.Jasmine
+import Text.Jasmine (minify)
 import WWW.Base (baseHakyll, domain, myHakyllWriterOptions, myHakyllReaderOptions)
 import WWW.Templates (myContext, defaultTemplate)
 
@@ -32,10 +32,10 @@ main = baseHakyll domain $ do
     match "data/licenses.yaml" $ compile $ yamlCompiler @(AliasMap StrictText License_)
     match "data/journals.yaml" $ compile $ yamlCompiler @(AliasMap StrictText Journal_)
 
-    match ("www/css/*.scss" .||. "css/*.sass") $ do
+    match ("www/css/*.scss" .||. "www/css/*.sass") $ do
         route $ dropParentRoute 1 `composeRoutes` setExtension "css"
         compile $ compressCss <<$>> sassCompiler
-    match "www/css/*css" $ do
+    match "www/css/*.css" $ do
         route $ dropParentRoute 1
         compile compressCssCompiler
     match "www/js/*.js" $ do
@@ -57,6 +57,11 @@ main = baseHakyll domain $ do
     --         , licenseCtxt @StrictText <$> loadBody "data/licenses.yaml"
     --         , journalCtxt @StrictText <$> loadBody "data/journals.yaml"
     --         ]
+    match "www/index.html" $ do
+        route $ dropParentRoute 1
+        compile $ do
+            getResourceBody >>= applyAsTemplate baseCtxt >>= applyTemplate defaultTemplate baseCtxt
+
     match "www/research/index.html" $ do
         route $ dropParentRoute 1
         compile $ do
@@ -67,7 +72,7 @@ main = baseHakyll domain $ do
                         , Name "Wells" "Chris" Nothing
                         ]   -- Remove me from the author list
                     }
-            getResourceBody >>= applyAsTemplate (mkPaperContext (FieldContext (personCtxt "data/people.yaml") (journalCtxt "data/journals.yaml")) fixedPapers) >>= applyTemplate defaultTemplate baseCtxt
+            getResourceBody >>= applyAsTemplate (mkPaperContext (personCtxt "data/people.yaml" <> journalCtxt "data/journals.yaml") fixedPapers) >>= applyTemplate defaultTemplate baseCtxt
     match "www/teaching/index.md" $ do
         route $ dropParentRoute 1 `composeRoutes` setExtension ".html"
         -- compile $ myPandocCompiler >>= applyAsTemplate baseCtxt >>= applyTemplate defaultTemplate baseCtxt