From cf234faa70146c7d0408dbe233b2b28eda413f71 Mon Sep 17 00:00:00 2001
From: Lehtinen Teemu <lehtint6@t31300-lr146.org.aalto.fi>
Date: Tue, 7 Jan 2020 09:13:20 +0200
Subject: [PATCH] Refactor common templates to content type
---
index.js | 24 +++---------------------
templates/body.html | 12 ------------
templates/head.html | 10 ----------
3 files changed, 3 insertions(+), 43 deletions(-)
delete mode 100644 templates/body.html
delete mode 100644 templates/head.html
diff --git a/index.js b/index.js
index 04174d4..da78c1c 100644
--- a/index.js
+++ b/index.js
@@ -1,11 +1,9 @@
-/* global module, require, __dirname, console */
+/* global module, require, console */
/* jshint globalstrict: true */
'use strict';
-let nj = require('nunjucks');
let Package = function () {};
-let baseDir = __dirname;
let content = require('./content');
Package.meta = {
@@ -29,25 +27,9 @@ Package.register = function (handlers, app, conf) {
};
Package.initialize = function (req, params, handlers, cb) {
- let templateDir = baseDir + '/templates/';
- nj.configure(templateDir, { autoescape: false });
-
let config = content[params.name];
- config.abFlag = params.abFlag;
-
- if (config.template) {
- config.html = nj.render(config.template, config);
- }
-
- let templateParam = {
- id: 'acos-webdev-inspector-' + params.name,
- config: JSON.stringify(config),
- script: typeof(config.script) == 'function' ? config.script.toString() : undefined,
- points: typeof(config.points) == 'function' ? config.points.toString() : undefined
- };
- params.headContent += nj.render('head.html', templateParam);
- params.bodyContent += nj.render('body.html', templateParam);
- cb();
+ config.resetButton = true;
+ cb(config);
};
module.exports = Package;
diff --git a/templates/body.html b/templates/body.html
deleted file mode 100644
index 8d1532a..0000000
--- a/templates/body.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="{{ id }}" class="acos-webdev-exercise acos-webdev-inspector">
- <div class="guide-column">
- <p class="instructions"></p>
- <div class="state">
- <div class="points"></div>
- </div>
- <div class="toolbar">
- <button class="reset-button">Reset</button>
- </div>
- </div>
- <div class="exercise"></div>
-</div>
diff --git a/templates/head.html b/templates/head.html
deleted file mode 100644
index 995d19e..0000000
--- a/templates/head.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<script>
- $(document).ready(function () {
- new ACOSWebdev(
- $('#{{ id }}'),
- {{ config }},
- {% if points %}{{ points }}{% else %}undefined{% endif %}
- );
- });
- {% if script %}{{ script }}{% endif %}
-</script>
--
GitLab