theluyuan/shynet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update litepicker and add ranges plugin

Browse Source
This commit is contained in:
Paweł Jastrzębski 2021-04-21 11:47:50 +02:00
parent 351efff147
commit 3d43f223eb
5 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package-lock.json generated
View File

@ -32,9 +32,9 @@
"integrity": "sha512-6v0WK8FHkVYbNQZ7L9O5tP8280pgTBR9ydxqYwssMuUH6SZO70ZFK/NQ1Ob8nNmOOzpUJAzT0WE73ty96z1tAQ==" "integrity": "sha512-6v0WK8FHkVYbNQZ7L9O5tP8280pgTBR9ydxqYwssMuUH6SZO70ZFK/NQ1Ob8nNmOOzpUJAzT0WE73ty96z1tAQ=="
}, },
"litepicker": { "litepicker": {
"version": "1.5.7", "version": "2.0.11",
"resolved": "https://registry.npmjs.org/litepicker/-/litepicker-1.5.7.tgz", "resolved": "https://registry.npmjs.org/litepicker/-/litepicker-2.0.11.tgz",
"integrity": "sha512-4L2ZcF8iqCE4A/qGWS3PbdFplZR1g751x5SsZ87zCRZ4LQN1Fgezarnvqi0eHk/kDWK7Qx0HZ9Y4bNznJMF1xA==" "integrity": "sha512-7MECMp2EDGIYDIz9QT24t9hWpgBD9JD57ZdDrbffNMGfbw0JVhBhvlYsyaIUuYhywtLvgmI5lfulM7XF2HLEkg=="
}, },
"svg.draggable.js": { "svg.draggable.js": {
"version": "2.2.2", "version": "2.2.2",

2
package.json
View File

@ -21,6 +21,6 @@
"a17t": "^0.5.1", "a17t": "^0.5.1",
"apexcharts": "^3.24.0", "apexcharts": "^3.24.0",
"inter-ui": "^3.15.0", "inter-ui": "^3.15.0",
"litepicker": "^1.5.7" "litepicker": "^2.0.11"
} }
} }

7
shynet/dashboard/templates/base.html
View File

@ -10,7 +10,10 @@
{% include 'a17t/includes/head.html' %} {% include 'a17t/includes/head.html' %}
<link rel="icon" type="image/png" href="{% static 'dashboard/images/icon.png' %}"> <link rel="icon" type="image/png" href="{% static 'dashboard/images/icon.png' %}">
<script src="{% static 'apexcharts/dist/apexcharts.min.js'%}"></script> <script src="{% static 'apexcharts/dist/apexcharts.min.js'%}"></script>
<script src="{% static 'litepicker/dist/js/main.js' %}"></script> <script src="{% static 'litepicker/dist/nocss/litepicker.js' %}"></script>
<script src="{% static 'litepicker/dist/plugins/ranges.js' %}"></script>
<link rel="stylesheet" href="{% static 'litepicker/dist/css/litepicker.css' %}">
<script src="{% static 'dashboard/js/base.js' %}"></script> <script src="{% static 'dashboard/js/base.js' %}"></script>
<link rel="stylesheet" href="{% static 'dashboard/css/global.css' %}"> <link rel="stylesheet" href="{% static 'dashboard/css/global.css' %}">
{% block extra_head %} {% block extra_head %}
@ -121,4 +124,4 @@
{% endblock %} {% endblock %}
</body> </body>
</html> </html>

3
shynet/dashboard/templates/dashboard/includes/date_range.html
View File

@ -17,6 +17,7 @@
<script> <script>
var picker = new Litepicker({ var picker = new Litepicker({
element: document.getElementById('rangePicker'), element: document.getElementById('rangePicker'),
plugins: ['ranges'],
singleMode: false, singleMode: false,
format: 'MMM D, YYYY', format: 'MMM D, YYYY',
maxDate: new Date(), maxDate: new Date(),
@ -30,4 +31,4 @@
document.getElementById("datePicker").submit(); document.getElementById("datePicker").submit();
} }
}); });
</script> </script>

6
shynet/shynet/settings.py
View File

@ -301,7 +301,11 @@ NPM_ROOT_PATH = "../"
NPM_FILE_PATTERNS = { NPM_FILE_PATTERNS = {
"a17t": [os.path.join("dist", "a17t.css"), os.path.join("dist", "tailwind.css")], "a17t": [os.path.join("dist", "a17t.css"), os.path.join("dist", "tailwind.css")],
"apexcharts": [os.path.join("dist", "apexcharts.min.js")], "apexcharts": [os.path.join("dist", "apexcharts.min.js")],
"litepicker": [os.path.join("dist", "js", "main.js")], "litepicker": [
os.path.join("dist", "nocss", "litepicker.js"),
os.path.join("dist", "css", "litepicker.css"),
os.path.join("dist", "plugins", "ranges.js"),
],
"turbolinks": [os.path.join("dist", "turbolinks.js")], "turbolinks": [os.path.join("dist", "turbolinks.js")],
"stimulus": [os.path.join("dist", "stimulus.umd.js")], "stimulus": [os.path.join("dist", "stimulus.umd.js")],
"inter-ui": [os.path.join("Inter (web)", "*")], "inter-ui": [os.path.join("Inter (web)", "*")],