url to npm dependencies is prefixed

requirements.txt

@@ -14,6 +14,7 @@ django-common-helpers==0.9.2
 django-cron==0.5.1
 django-excel==0.0.10
 django-formtools==2.2
+django-npm==1.0.0
 django-otp==1.0.2
 django-phonenumber-field==5.0.0
 django-stronghold==0.4.0
@@ -60,4 +61,4 @@ whitenoise==5.2.0
 xlrd==1.2.0
 xlwt==1.3.0
 parameterized==0.7.4
-setuptools==50.3.2
\ No newline at end of file
+setuptools==50.3.2

smash/smash/settings.py

@@ -179,3 +179,5 @@ if not SERVE_STATIC:
 
 if FORCE_2FA:
     MIDDLEWARE.append('smash.middleware.force_2fa_middleware.Force2FAMiddleware')
+
+NPM_STATIC_FILES_PREFIX = 'npm'

smash/web/templates/_base.html

@@ -8,22 +8,22 @@
 
     {% block styles %}
         <!-- Bootstrap 3.3.6 -->
-        <link rel="stylesheet" href="{% static 'bootstrap/dist/css/bootstrap.min.css' %}">
+        <link rel="stylesheet" href="{% static 'npm/bootstrap/dist/css/bootstrap.min.css' %}">
 
         <!-- Font Awesome -->
-        <link rel="stylesheet" href="{% static 'font-awesome/css/font-awesome.min.css'%}">
+        <link rel="stylesheet" href="{% static 'npm/font-awesome/css/font-awesome.min.css'%}">
 
         <!-- Ionicons -->
-        <link rel="stylesheet" href="{% static 'ionicons/css/ionicons.min.css'%}">
+        <link rel="stylesheet" href="{% static 'npm/ionicons/css/ionicons.min.css'%}">
 
         <!-- Theme style -->
-        <link rel="stylesheet" href="{% static 'admin-lte/dist/css/AdminLTE.min.css' %}">
+        <link rel="stylesheet" href="{% static 'npm/admin-lte/dist/css/AdminLTE.min.css' %}">
 
-        <link rel="stylesheet" href="{% static 'admin-lte/dist/css/skins/skin-green.min.css' %}">
+        <link rel="stylesheet" href="{% static 'npm/admin-lte/dist/css/skins/skin-green.min.css' %}">
 
         <link rel="stylesheet" href="{% static 'css/smash.css' %}">
 
-        <link rel="stylesheet" href="{% static 'jquery-ui-dist/jquery-ui.min.css' %}">
+        <link rel="stylesheet" href="{% static 'npm/jquery-ui-dist/jquery-ui.min.css' %}">
 
 
         <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
@@ -359,16 +359,16 @@ desired effect
 
 {% block scripts %}
     <!-- jQuery 2.2.3 -->
-    <script src="{% static 'jquery/dist/jquery.min.js' %}"></script>
-    <script src="{% static 'jquery-ui-dist/jquery-ui.min.js' %}"></script>
+    <script src="{% static 'npm/jquery/dist/jquery.min.js' %}"></script>
+    <script src="{% static 'npm/jquery-ui-dist/jquery-ui.min.js' %}"></script>
     <!-- Bootstrap 3.3.6 -->
-    <script src="{% static 'bootstrap/dist/js/bootstrap.min.js' %}"></script>
+    <script src="{% static 'npm/bootstrap/dist/js/bootstrap.min.js' %}"></script>
     <!-- AdminLTE Template Helpers (for example- left side bar) -->
-    <script src="{% static 'admin-lte/dist/js/app.min.js' %}"></script>
+    <script src="{% static 'npm/admin-lte/dist/js/app.min.js' %}"></script>
     <!-- Smash js -->
     <script src="{% static 'js/smash.js' %}"></script>
-    <script src="{% static 'moment/min/moment.min.js' %}"></script>
-    <script src="{% static 'moment-range/dist/moment-range.js' %}"></script>
+    <script src="{% static 'npm/moment/min/moment.min.js' %}"></script>
+    <script src="{% static 'npm/moment-range/dist/moment-range.js' %}"></script>
     <script type="text/javascript">
         window['moment-range'].extendMoment(moment);
     </script>

smash/web/templates/appointment_types/add_edit.html

@@ -4,7 +4,7 @@
 
 {% block styles %}
     {{ block.super }}
-    <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/>
+    <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/>
 
 {% endblock styles %}
 
@@ -72,6 +72,6 @@
 {% block scripts %}
     {{ block.super }}
 
-    <script src="{% static 'awesomplete/awesomplete.min.js' %}"></script>
+    <script src="{% static 'npm/awesomplete/awesomplete.min.js' %}"></script>
 
 {% endblock scripts %}
\ No newline at end of file

smash/web/templates/appointment_types/confirm_delete.html

@@ -4,7 +4,7 @@
 
 {% block styles %}
     {{ block.super }}
-    <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/>
+    <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/>
 
 {% endblock styles %}
 
@@ -55,7 +55,7 @@
 {% block scripts %}
     {{ block.super }}
 
-    <script src="{% static 'awesomplete/awesomplete.min.js' %}"></script>
+    <script src="{% static 'npm/awesomplete/awesomplete.min.js' %}"></script>
 
 {% endblock scripts %}
 

smash/web/templates/appointment_types/index.html

@@ -4,7 +4,7 @@
 {% block styles %}
     {{ block.super }}
     <!-- DataTables -->
-    <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}">
+    <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}">
     <style type="text/css">
     .no_leave{
         height: 100%;
@@ -101,8 +101,8 @@
 {% block scripts %}
     {{ block.super }}
 
-    <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script>
-    <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script>
+    <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script>
+    <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script>
     <script>
         $(function () {
             $('#table').DataTable({

smash/web/templates/appointments/add.html

@@ -6,13 +6,13 @@
     {{ block.super }}
 
     <!-- DataTables -->
-    <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}">
+    <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}">
 
     <!-- fullCalendar 2.2.5-->
-    <link rel="stylesheet" href="{% static 'fullcalendar/dist/fullcalendar.min.css' %}">
-    <link rel="stylesheet" href="{% static 'fullcalendar/dist/fullcalendar.print.css' %}" media="print">
+    <link rel="stylesheet" href="{% static 'npm/fullcalendar/dist/fullcalendar.min.css' %}">
+    <link rel="stylesheet" href="{% static 'npm/fullcalendar/dist/fullcalendar.print.css' %}" media="print">
     <link rel="stylesheet" href="{% static 'css/fullcalendar_custom.print.css' %}" media="print" />
-    <link rel="stylesheet" href="{% static 'fullcalendar-scheduler/dist/scheduler.min.css' %}">
+    <link rel="stylesheet" href="{% static 'npm/fullcalendar-scheduler/dist/scheduler.min.css' %}">
     <link rel="stylesheet" href="{% static 'css/daily_planning.css' %}">
 
     {% include "includes/datetimepicker.css.html" %}
@@ -132,13 +132,13 @@ New appointment for visit from {{visit_start}} to {{visit_end}}
 {% block scripts %}
     {{ block.super }}
 
-    <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script>
-    <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script>
-    <script src="{% static 'moment/min/moment.min.js' %}"></script>
-    <script src="{% static 'moment-range/dist/moment-range.js' %}"></script>
+    <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script>
+    <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script>
+    <script src="{% static 'npm/moment/min/moment.min.js' %}"></script>
+    <script src="{% static 'npm/moment-range/dist/moment-range.js' %}"></script>
     <script src="{% static 'js/appointment.js' %}"></script>
-    <script src="{% static 'fullcalendar/dist/fullcalendar.min.js' %}"></script>
-    <script src="{% static 'fullcalendar-scheduler/dist/scheduler.min.js' %}"></script>
+    <script src="{% static 'npm/fullcalendar/dist/fullcalendar.min.js' %}"></script>
+    <script src="{% static 'npm/fullcalendar-scheduler/dist/scheduler.min.js' %}"></script>
     <script>
         $(function () {
             $('#table').DataTable({

smash/web/templates/appointments/confirm_delete.html

@@ -4,7 +4,7 @@
 
 {% block styles %}
     {{ block.super }}
-    <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/>
+    <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/>
 
 {% endblock styles %}
 
@@ -55,7 +55,7 @@
 {% block scripts %}
     {{ block.super }}
 
-    <script src="{% static 'awesomplete/awesomplete.min.js' %}"></script>
+    <script src="{% static 'npm/awesomplete/awesomplete.min.js' %}"></script>
 
 {% endblock scripts %}
 

smash/web/templates/appointments/details.html

@@ -5,7 +5,7 @@
 {% block styles %}
     {{ block.super }}
     <!-- DataTables -->
-    <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}">
+    <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}">
 
     {% include "includes/datetimepicker.css.html" %}
 {% endblock styles %}
@@ -72,8 +72,8 @@
 {% block scripts %}
     {{ block.super }}
 
-    <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script>
-    <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script>
+    <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script>
+    <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script>
     <script>
         $(function () {
             $('#table').DataTable({

smash/web/templates/appointments/edit.html

@@ -5,7 +5,7 @@
 {% block styles %}
     {{ block.super }}
     <!-- DataTables -->
-    <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}">
+    <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}">
 
     {% include "includes/datetimepicker.css.html" %}
     <link rel="stylesheet" href="{% static 'css/appointment.css' %}">
@@ -151,8 +151,8 @@
 {% block scripts %}
     {{ block.super }}
 
-    <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script>
-    <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script>
+    <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script>
+    <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script>
     <script src="{% static 'js/appointment.js' %}"></script>
     <script>
         $(function () {

smash/web/templates/appointments/index.html

@@ -4,11 +4,11 @@
 {% block styles %}
     {{ block.super }}
     <!-- DataTables -->
-    <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}">
+    <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}">
 
     <!-- fullCalendar 2.2.5-->
-    <link rel="stylesheet" href="{% static 'fullcalendar/dist/fullcalendar.min.css' %}">
-    <link rel="stylesheet" href="{% static 'fullcalendar/dist/fullcalendar.print.css' %}" media="print">
+    <link rel="stylesheet" href="{% static 'npm/fullcalendar/dist/fullcalendar.min.css' %}">
+    <link rel="stylesheet" href="{% static 'npm/fullcalendar/dist/fullcalendar.print.css' %}" media="print">
 {% endblock styles %}
 
 {% block ui_active_tab %}'appointments'{% endblock ui_active_tab %}
@@ -67,9 +67,9 @@
 {% block scripts %}
     {{ block.super }}
 
-    <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script>
-    <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script>
-    <script src="{% static 'fullcalendar/dist/fullcalendar.min.js' %}"></script>
+    <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script>
+    <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script>
+    <script src="{% static 'npm/fullcalendar/dist/fullcalendar.min.js' %}"></script>
     <script src="{% static 'js/appointment.js' %}"></script>
 
     <script>

smash/web/templates/appointments/list.html

@@ -4,7 +4,7 @@
 {% block styles %}
     {{ block.super }}
     <!-- DataTables -->
-    <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}">
+    <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}">
 
 {% endblock styles %}
 
@@ -31,8 +31,8 @@
 {% block scripts %}
     {{ block.super }}
 
-    <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script>
-    <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script>
+    <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script>
+    <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script>
     <script src="{% static 'js/appointment.js' %}"></script>
 
     <script>

smash/web/templates/configuration/index.html

@@ -5,7 +5,7 @@
 {% block styles %}
     {{ block.super }}
     <!-- DataTables -->
-    <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}">
+    <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}">
 
 {% endblock styles %}
 
@@ -45,9 +45,9 @@
 {% block scripts %}
     {{ block.super }}
 
-    <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script>
-    <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script>
-    <script src="{% static 'moment/min/moment.min.js' %}"></script>
+    <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script>
+    <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script>
+    <script src="{% static 'npm/moment/min/moment.min.js' %}"></script>
 
     <script>
         function update(id) {

smash/web/templates/contact_attempt/add.html

@@ -4,7 +4,7 @@
 
 {% block styles %}
     {{ block.super }}
-    <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/>
+    <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/>
 
     {% include "includes/datepicker.css.html" %}
 {% endblock styles %}
@@ -75,7 +75,7 @@
 {% block scripts %}
     {{ block.super }}
 
-    <script src="{% static 'awesomplete/awesomplete.min.js' %}"></script>
+    <script src="{% static 'npm/awesomplete/awesomplete.min.js' %}"></script>
 
     {% include "includes/datetimepicker.js.html" %}
 {% endblock scripts %}

smash/web/templates/contact_attempt/edit.html

@@ -4,7 +4,7 @@
 
 {% block styles %}
     {{ block.super }}
-    <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/>
+    <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/>
 
     {% include "includes/datepicker.css.html" %}
 {% endblock styles %}
@@ -75,7 +75,7 @@
 {% block scripts %}
     {{ block.super }}
 
-    <script src="{% static 'awesomplete/awesomplete.min.js' %}"></script>
+    <script src="{% static 'npm/awesomplete/awesomplete.min.js' %}"></script>
 
     {% include "includes/datetimepicker.js.html" %}
 {% endblock scripts %}

smash/web/templates/custom_study_subject_field/add_edit.html

@@ -4,7 +4,7 @@
 
 {% block styles %}
     {{ block.super }}
-    <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/>
+    <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/>
 
     {% include "includes/datepicker.css.html" %}
 {% endblock styles %}
@@ -76,7 +76,7 @@
 {% block scripts %}
     {{ block.super }}
 
-    <script src="{% static 'awesomplete/awesomplete.min.js' %}"></script>
+    <script src="{% static 'npm/awesomplete/awesomplete.min.js' %}"></script>
 
     {% include "includes/datetimepicker.js.html" %}
 

smash/web/templates/daily_planning.html

@@ -4,19 +4,19 @@
 {% block styles %}
     {{ block.super }}
     <!-- DataTables -->
-    <script src="{% static 'jquery/dist/jquery.min.js' %}"></script>
-    <script src="{% static 'jquery-ui-dist/jquery-ui.min.js' %}"></script>
-    <link rel="stylesheet" href="{% static 'jquery-ui-dist/jquery-ui.min.css' %}">
-    <link rel="stylesheet" href="{% static 'jquery-ui-dist/jquery-ui.theme.min.css' %}">
-    <link rel="stylesheet" href="{% static 'jquery-ui-dist/jquery-ui.structure.min.css' %}">
-    <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}">
+    <script src="{% static 'npm/jquery/dist/jquery.min.js' %}"></script>
+    <script src="{% static 'npm/jquery-ui-dist/jquery-ui.min.js' %}"></script>
+    <link rel="stylesheet" href="{% static 'npm/jquery-ui-dist/jquery-ui.min.css' %}">
+    <link rel="stylesheet" href="{% static 'npm/jquery-ui-dist/jquery-ui.theme.min.css' %}">
+    <link rel="stylesheet" href="{% static 'npm/jquery-ui-dist/jquery-ui.structure.min.css' %}">
+    <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}">
 
     <!-- fullCalendar 2.2.5-->
-    <link rel="stylesheet" href="{% static 'fullcalendar/dist/fullcalendar.min.css' %}">
+    <link rel="stylesheet" href="{% static 'npm/fullcalendar/dist/fullcalendar.min.css' %}">
     <link rel="stylesheet" href="{% static 'css/fullcalendar_custom.print.css' %}"
           media="print"
     />
-    <link rel="stylesheet" href="{% static 'fullcalendar-scheduler/dist/scheduler.min.css' %}">
+    <link rel="stylesheet" href="{% static 'npm/fullcalendar-scheduler/dist/scheduler.min.css' %}">
     <link rel="stylesheet" href="{% static 'css/daily_planning.css' %}">
     <style type="text/css">
         .role_label{
@@ -120,8 +120,8 @@
 
 {% block scripts %}
     {{ block.super }}
-    <script src="{% static 'fullcalendar/dist/fullcalendar.min.js' %}"></script>
-    <script src="{% static 'fullcalendar-scheduler/dist/scheduler.min.js' %}"></script>
+    <script src="{% static 'npm/fullcalendar/dist/fullcalendar.min.js' %}"></script>
+    <script src="{% static 'npm/fullcalendar-scheduler/dist/scheduler.min.js' %}"></script>
     <script>
         var resources_url = '{% url 'web.api.workers.daily_planning' %}';
         var events_url = '{% url 'web.api.events_persist' %}';
@@ -137,8 +137,8 @@
     </script>
     {% include "includes/datepicker.js.html" %}
     <script src="{% static 'js/daily_planning.js' %}"></script>
-    <script src="{% static 'jspdf/dist/jspdf.min.js' %}"></script>
-    <script src="{% static 'html2canvas/dist/html2canvas.min.js' %}"></script>
+    <script src="{% static 'npm/jspdf/dist/jspdf.min.js' %}"></script>
+    <script src="{% static 'npm/html2canvas/dist/html2canvas.min.js' %}"></script>
 
 {% endblock scripts %}
 

smash/web/templates/doctors/add.html

@@ -4,7 +4,7 @@
 
 {% block styles %}
     {{ block.super }}
-    <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/>
+    <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/>
     <style type="text/css">
         .hidden_form_field{
             display: none;
@@ -73,7 +73,7 @@
 {% block scripts %}
     {{ block.super }}
 
-    <script src="{% static 'awesomplete/awesomplete.min.js' %}"></script>
+    <script src="{% static 'npm/awesomplete/awesomplete.min.js' %}"></script>
     <script>
         // If ever to debug and thinking why it doesn't work => look if there is 'null' in data from API
         $.get("{% url 'web.api.specializations' %}", function (data) {

smash/web/templates/doctors/add_holiday.html

@@ -5,7 +5,7 @@
 {% block styles %}
     {{ block.super }}
     {% include "includes/datetimepicker.css.html" %}
-    <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/>
+    <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/>
     <style type="text/css">
         .doctor_name {
             border-bottom: black 1px solid;

smash/web/templates/doctors/change_password.html

@@ -5,7 +5,7 @@
 {% block styles %}
     {{ block.super }}
     <!-- DataTables -->
-    <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}">
+    <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}">
     <style type="text/css">
         .hidden_form_field{
             display: none;