Skip to content

Commit

Permalink
♻️ : make the sidebar a vue component
Browse files Browse the repository at this point in the history
  • Loading branch information
@juwit
juwit committed Aug 30, 2019
1 parent 408efe8 commit 008a029
Show file tree
Hide file tree
Showing 13 changed files with 77 additions and 137 deletions.
12 changes: 3 additions & 9 deletions src/main/resources/templates/empty_page.tpl
View file
Expand Up @@ -29,7 +29,7 @@
<div class="full_container">
<div class="inner_container">

<div th:replace="~{layout/sidebar}"></div>
<div id="sidebar-placeholder"></div>

<!-- right content -->
<div id="content">
Expand Down Expand Up @@ -58,13 +58,7 @@
<script src="/webjars/popper.js/1.14.3/umd/popper.min.js"></script>
<script src="/webjars/bootstrap/4.3.1/js/bootstrap.min.js"></script>

<script type="application/ecmascript">
$(document).ready(function () {
/*-- sidebar js --*/
$('#sidebarCollapse').on('click', function () {
$('#sidebar').toggleClass('active');
});
});
</script>
<div th:replace="vue_templates/sidebar"></div>

</body>
</html>
12 changes: 3 additions & 9 deletions src/main/resources/templates/index.html
View file
Expand Up @@ -10,7 +10,7 @@
<div class="full_container">
<div class="inner_container">

<div th:replace="~{layout/sidebar}"></div>
<div id="sidebar-placeholder"></div>

<!-- right content -->
<div id="content">
Expand Down Expand Up @@ -68,6 +68,8 @@ <h3>Hi there ! </h3>
<script src="/webjars/vue/2.5.16/vue.js"></script>
<script src="/webjars/bootstrap-vue/2.0.0-rc.26/dist/bootstrap-vue.js"></script>

<div th:replace="vue_templates/sidebar"></div>

<div th:replace="vue_templates/breadcrumb"></div>
<div th:replace="vue_templates/dashboard-widget"></div>

Expand Down Expand Up @@ -95,13 +97,5 @@ <h3>Hi there ! </h3>
});
</script>

<script type="application/ecmascript">
$(document).ready(function () {
/*-- sidebar js --*/
$('#sidebarCollapse').on('click', function () {
$('#sidebar').toggleClass('active');
});
});
</script>
</body>
</html>
13 changes: 3 additions & 10 deletions src/main/resources/templates/job.html
View file
Expand Up @@ -9,7 +9,7 @@
<div class="full_container">
<div class="inner_container">

<div th:replace="~{layout/sidebar}"></div>
<div id="sidebar-placeholder"></div>

<!-- right content -->
<div id="content">
Expand Down Expand Up @@ -71,6 +71,8 @@ <h2>Stack {{stack.name}}</h2>
<script src="/webjars/vue/2.5.16/vue.js"></script>
<script src="/webjars/bootstrap-vue/2.0.0-rc.26/dist/bootstrap-vue.js"></script>

<div th:replace="vue_templates/sidebar"></div>

<div th:replace="helpers/messenger"></div>

<div th:replace="vue_templates/cli-badge"></div>
Expand Down Expand Up @@ -137,14 +139,5 @@ <h2>Stack {{stack.name}}</h2>
});
</script>

<script type="application/ecmascript">
$(document).ready(function () {
/*-- sidebar js --*/
$('#sidebarCollapse').on('click', function () {
$('#sidebar').toggleClass('active');
});
});
</script>

</body>
</html>
42 changes: 0 additions & 42 deletions src/main/resources/templates/layout/sidebar.html
View file

This file was deleted.

12 changes: 2 additions & 10 deletions src/main/resources/templates/module.html
View file
Expand Up @@ -9,7 +9,7 @@
<div class="full_container">
<div class="inner_container">

<div th:replace="~{layout/sidebar}"></div>
<div id="sidebar-placeholder"></div>

<!-- right content -->
<div id="content">
Expand Down Expand Up @@ -168,6 +168,7 @@ <h2>Variables <b-button variant="success" @click="addVar()"><i class="fas fa-plu

<div th:replace="helpers/messenger"></div>
<div th:replace="vue_templates/breadcrumb"></div>
<div th:replace="vue_templates/sidebar"></div>

<script th:inline="javascript" type="application/ecmascript">
Vue.component('vue-multiselect', window.VueMultiselect.default);
Expand Down Expand Up @@ -228,14 +229,5 @@ <h2>Variables <b-button variant="success" @click="addVar()"><i class="fas fa-plu
});
</script>

<script type="application/ecmascript">
$(document).ready(function () {
/*-- sidebar js --*/
$('#sidebarCollapse').on('click', function () {
$('#sidebar').toggleClass('active');
});
});
</script>

</body>
</html>
12 changes: 2 additions & 10 deletions src/main/resources/templates/module_description.html
View file
Expand Up @@ -9,7 +9,7 @@
<div class="full_container">
<div class="inner_container">

<div th:replace="~{layout/sidebar}"></div>
<div id="sidebar-placeholder"></div>

<!-- right content -->
<div id="content">
Expand Down Expand Up @@ -105,6 +105,7 @@ <h1>
<div th:replace="vue_templates/readme"></div>
<div th:replace="vue_templates/markdown"></div>
<div th:replace="vue_templates/breadcrumb"></div>
<div th:replace="vue_templates/sidebar"></div>

<div th:replace="helpers/messenger"></div>

Expand Down Expand Up @@ -142,14 +143,5 @@ <h1>
})
</script>

<script type="application/ecmascript">
$(document).ready(function () {
/*-- sidebar js --*/
$('#sidebarCollapse').on('click', function () {
$('#sidebar').toggleClass('active');
});
});
</script>

</body>
</html>
7 changes: 2 additions & 5 deletions src/main/resources/templates/modules.html
View file
Expand Up @@ -9,7 +9,7 @@
<div class="full_container">
<div class="inner_container">

<div th:replace="~{layout/sidebar}"></div>
<div id="sidebar-placeholder"></div>

<!-- right content -->
<div id="content">
Expand Down Expand Up @@ -64,13 +64,10 @@
<script src="/webjars/bootstrap-vue/2.0.0-rc.26/dist/bootstrap-vue.js"></script>

<div th:replace="vue_templates/breadcrumb"></div>
<div th:replace="vue_templates/sidebar"></div>

<script type="application/ecmascript">
$(document).ready(function () {
/*-- sidebar js --*/
$('#sidebarCollapse').on('click', function () {
$('#sidebar').toggleClass('active');
});
$(function () {
$('[data-toggle="tooltip"]').tooltip()
});
Expand Down
12 changes: 2 additions & 10 deletions src/main/resources/templates/new_stack.html
View file
Expand Up @@ -9,7 +9,7 @@
<div class="full_container">
<div class="inner_container">

<div th:replace="~{layout/sidebar}"></div>
<div id="sidebar-placeholder"></div>

<!-- right content -->
<div id="content">
Expand Down Expand Up @@ -41,6 +41,7 @@

<div th:replace="vue_templates/stack-vars"></div>
<div th:replace="vue_templates/breadcrumb"></div>
<div th:replace="vue_templates/sidebar"></div>

<template id="template">
<div>
Expand Down Expand Up @@ -240,14 +241,5 @@ <h2>Run</h2>
});
</script>

<script type="application/ecmascript">
$(document).ready(function () {
/*-- sidebar js --*/
$('#sidebarCollapse').on('click', function () {
$('#sidebar').toggleClass('active');
});
});
</script>

</body>
</html>
14 changes: 2 additions & 12 deletions src/main/resources/templates/settings.html
View file
Expand Up @@ -9,7 +9,7 @@
<div class="full_container">
<div class="inner_container">

<div th:replace="~{layout/sidebar}"></div>
<div id="sidebar-placeholder"></div>

<!-- right content -->
<div id="content">
Expand Down Expand Up @@ -40,8 +40,6 @@
<script src="webjars/jquery/3.0.0/jquery.min.js"></script>
<script src="webjars/popper.js/1.14.3/popper.min.js"></script>
<script src="webjars/bootstrap/4.3.1/js/bootstrap.min.js"></script>
</body>
</html>

<template id="template">
<div class="block">
Expand Down Expand Up @@ -90,6 +88,7 @@ <h2>Environment Variables <button type="button" class="btn btn-success" @click="
<script src="/webjars/vue/2.5.16/vue.js"></script>
<script src="/webjars/bootstrap-vue/2.0.0-rc.26/dist/bootstrap-vue.js"></script>

<div th:replace="vue_templates/sidebar"></div>
<div th:replace="helpers/messenger"></div>
<div th:replace="vue_templates/breadcrumb"></div>

Expand Down Expand Up @@ -134,14 +133,5 @@ <h2>Environment Variables <button type="button" class="btn btn-success" @click="
});
</script>

<script type="application/ecmascript">
$(document).ready(function () {
/*-- sidebar js --*/
$('#sidebarCollapse').on('click', function () {
$('#sidebar').toggleClass('active');
});
});
</script>

</body>
</html>
12 changes: 2 additions & 10 deletions src/main/resources/templates/stack.html
View file
Expand Up @@ -9,7 +9,7 @@
<div class="full_container">
<div class="inner_container">

<div th:replace="~{layout/sidebar}"></div>
<div id="sidebar-placeholder"></div>

<!-- right content -->
<div id="content">
Expand Down Expand Up @@ -47,6 +47,7 @@
<div th:replace="vue_templates/stack-vars"></div>
<div th:replace="vue_templates/breadcrumb"></div>
<div th:replace="vue_templates/user-badge"></div>
<div th:replace="vue_templates/sidebar"></div>

<template id="stack-controls">
<div class="page_controls">
Expand Down Expand Up @@ -356,14 +357,5 @@ <h2><span><i class="fas fa-history"></i> Job history</span></h2>

</script>

<script type="application/ecmascript">
$(document).ready(function () {
/*-- sidebar js --*/
$('#sidebarCollapse').on('click', function () {
$('#sidebar').toggleClass('active');
});
});
</script>

</body>
</html>
7 changes: 2 additions & 5 deletions src/main/resources/templates/stacks.html
View file
Expand Up @@ -9,7 +9,7 @@
<div class="full_container">
<div class="inner_container">

<div th:replace="~{layout/sidebar}"></div>
<div id="sidebar-placeholder"></div>

<!-- right content -->
<div id="content">
Expand Down Expand Up @@ -62,6 +62,7 @@
<script src="/webjars/bootstrap-vue/2.0.0-rc.26/dist/bootstrap-vue.js"></script>

<div th:replace="vue_templates/breadcrumb"></div>
<div th:replace="vue_templates/sidebar"></div>

<script type="application/ecmascript">
let stacks;
Expand All @@ -81,10 +82,6 @@
});

$(document).ready(function () {
/*-- sidebar js --*/
$('#sidebarCollapse').on('click', function () {
$('#sidebar').toggleClass('active');
});
$(function () {
$('[data-toggle="tooltip"]').tooltip()
});
Expand Down
7 changes: 2 additions & 5 deletions src/main/resources/templates/users.html
View file
Expand Up @@ -9,7 +9,7 @@
<div class="full_container">
<div class="inner_container">

<div th:replace="~{layout/sidebar}"></div>
<div id="sidebar-placeholder"></div>

<!-- right content -->
<div id="content">
Expand Down Expand Up @@ -64,17 +64,14 @@

<script src="/webjars/vue-multiselect/2.1.6/dist/vue-multiselect.min.js"></script>

<div th:replace="vue_templates/sidebar"></div>
<div th:replace="helpers/messenger"></div>
<div th:replace="vue_templates/breadcrumb"></div>

<script type="application/ecmascript">
Vue.component('vue-multiselect', window.VueMultiselect.default);

$(document).ready(function () {
/*-- sidebar js --*/
$('#sidebarCollapse').on('click', function () {
$('#sidebar').toggleClass('active');
});
$(function () {
$('[data-toggle="tooltip"]').tooltip()
});
Expand Down

0 comments on commit 008a029

Please sign in to comment.