feat(handlers): Add generic error handler

2017-10-04 10:36:04 +02:00
parent 01fd3cc9b3
commit 67fc0edf62
6 changed files with 42 additions and 30 deletions
--- a/views/mixins/_lessonModuleImage.pug
+++ b/views/mixins/_lessonModuleImage.pug
@@ -1,6 +1,11 @@
 mixin lessonModuleImage(module)
  .lesson-module.lesson-module-image
+<<<<<<< Updated upstream
    if module.fields.file && module.fields.file.url
      img.lesson-module-image__image(src=module.fields.file.url alt=module.fields.title)
    else
      h3 ⚠️ Image missing
+=======
+    img.lesson-module-image__image(src=module.fields.image.fields.file.url alt=module.fields.image.fields.title)
+    div.lesson-module-image__title #{module.fields.title}
+>>>>>>> Stashed changes