Skip to content
This repository has been archived by the owner on May 31, 2024. It is now read-only.

Commit

Permalink
Merge pull request #75 from hardingadonis/vuong-dashboard
Browse files Browse the repository at this point in the history
Fix js, css, jsp
  • Loading branch information
hardingadonis authored Jan 22, 2024
2 parents b583064 + 6a3f761 commit 58099c4
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 25 deletions.
6 changes: 6 additions & 0 deletions src/main/webapp/view/assets/css/bootstrap.min.css

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions src/main/webapp/view/assets/js/bootstrap.min.js

Large diffs are not rendered by default.

44 changes: 21 additions & 23 deletions src/main/webapp/view/assets/js/bs-init.js
Original file line number Diff line number Diff line change
@@ -1,30 +1,28 @@

if (window.innerWidth < 768) {
[].slice.call(document.querySelectorAll('[data-bss-disabled-mobile]')).forEach(function (elem) {
elem.classList.remove('animated');
elem.removeAttribute('data-bss-hover-animate');
elem.removeAttribute('data-aos');
elem.removeAttribute('data-bss-parallax-bg');
elem.removeAttribute('data-bss-scroll-zoom');
});
[].slice.call(document.querySelectorAll('[data-bss-disabled-mobile]')).forEach(function (elem) {
elem.classList.remove('animated');
elem.removeAttribute('data-bss-hover-animate');
elem.removeAttribute('data-aos');
elem.removeAttribute('data-bss-parallax-bg');
elem.removeAttribute('data-bss-scroll-zoom');
});
}

document.addEventListener('DOMContentLoaded', function() {
document.addEventListener('DOMContentLoaded', function () {

var hoverAnimationTriggerList = [].slice.call(document.querySelectorAll('[data-bss-hover-animate]'));
var hoverAnimationList = hoverAnimationTriggerList.forEach(function (hoverAnimationEl) {
hoverAnimationEl.addEventListener('mouseenter', function(e){ e.target.classList.add('animated', e.target.dataset.bssHoverAnimate) });
hoverAnimationEl.addEventListener('mouseleave', function(e){ e.target.classList.remove('animated', e.target.dataset.bssHoverAnimate) });
});
var hoverAnimationTriggerList = [].slice.call(document.querySelectorAll('[data-bss-hover-animate]'));
var hoverAnimationList = hoverAnimationTriggerList.forEach(function (hoverAnimationEl) {
hoverAnimationEl.addEventListener('mouseenter', function (e) {
e.target.classList.add('animated', e.target.dataset.bssHoverAnimate)
});
hoverAnimationEl.addEventListener('mouseleave', function (e) {
e.target.classList.remove('animated', e.target.dataset.bssHoverAnimate)
});
});

var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bss-tooltip]'));
var tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) {
return new bootstrap.Tooltip(tooltipTriggerEl);
})

var charts = document.querySelectorAll('[data-bss-chart]');

for (var chart of charts) {
chart.chart = new Chart(chart, JSON.parse(chart.dataset.bssChart));
}
var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bss-tooltip]'));
var tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) {
return new bootstrap.Tooltip(tooltipTriggerEl);
})
}, false);
2 changes: 1 addition & 1 deletion src/main/webapp/view/common/_footer.jsp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<footer class="bg-white sticky-footer">
<div class="container my-auto">
<div class="text-center my-auto copyright">
<h6>Copyright @ Sale Dock 2024</h6>
<h6>Copyright © Sale Dock 2024</h6>

<a href="https://github.com/hardingadonis/saledock" target="_blank">
<img class="img-fluid" src="https://contrib.rocks/image?repo=hardingadonis/saledock" style="transform: scale(0.70);">
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/view/common/_nav.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<span class="d-none d-lg-inline me-2 text-gray-600 small">
${sessionScope.employee.fullName}
</span>
<img class="border rounded-circle img-profile" src="<%=request.getContextPath()%>/assets/img/avatars/employee.png">
<img class="border rounded-circle img-profile" src="<%=request.getContextPath()%>/view/assets/images/icons/employee.png">
</a>

<div class="dropdown-menu shadow dropdown-menu-end animated--grow-in">
Expand Down

0 comments on commit 58099c4

Please sign in to comment.