[enh] split template and DRY using jinja2

This commit is contained in:
Laurent Peuch 2018-08-23 22:24:05 +02:00
parent 10a1bb3ef3
commit 9e24d3e1f7
5 changed files with 476 additions and 475 deletions

1
run.py
View file

@ -46,6 +46,7 @@ LOGGING_CONFIG_DEFAULTS["formatters"]["background"] = {
task_logger = logging.getLogger("task")
app = Sanic()
app.static('/static', './static/')
jinja = SanicJinja2(app)

0
static/js/app.js Normal file
View file

16
templates/base.html Normal file
View file

@ -0,0 +1,16 @@
<!doctype html>
<html>
<head>
<title><% block title %>YunoRunner for CI<% endblock %></title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.7.1/css/bulma.min.css">
<script defer src="https://use.fontawesome.com/releases/v5.1.0/js/all.js"></script>
<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
<script src="/static/js/app.js"></script>
</head>
<body>
<% block content %><% endblock %>
<% block javascript %><% endblock %>
</body>
</html>

View file

@ -1,14 +1,6 @@
<!doctype html>
<html>
<head>
<title>YunoRunner for CI</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.7.1/css/bulma.min.css">
<script defer src="https://use.fontawesome.com/releases/v5.1.0/js/all.js"></script>
<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
</head>
<body>
<% extends "base.html" %>
<% block content %>
<section class="section">
<div class="container">
<h1 class="title">Tasks</h1>
@ -36,6 +28,9 @@
</div>
</div>
</section>
<% endblock %>
<% block javascript %>
<script>
(function() {
var app = new Vue({
@ -72,5 +67,4 @@
};
})()
</script>
</body>
</html>
<% endblock %>

View file

@ -1,18 +1,6 @@
<!doctype html>
<html>
<head>
<title>YunoRunner for CI</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.7.1/css/bulma.min.css">
<script defer src="https://use.fontawesome.com/releases/v5.1.0/js/all.js"></script>
<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
<script src="https://code.jquery.com/jquery-3.3.1.min.js"
integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8="
crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.7.1/css/bulma.min.css"></script>
</head>
<body>
<% extends "base.html" %>
<% block content %>
<section class="section" id="job">
<div class="container">
<h1 class="title">Job '{{job.name}}'</h1>
@ -32,6 +20,9 @@
<pre class="consoleOutput" v-html="logWithColors"></pre>
</div>
</section>
<% endblock %>
<% block javascript %>
<style>
.consoleOutput {
max-height: 90vh;
@ -417,5 +408,4 @@
};
})()
</script>
</body>
</html>
<% endblock %>