Release v1.0.6 - JS & Template Refactoring

app-generator · app-generator · commit f0fb5474c72a · 2022-11-24T18:57:34.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## [1.0.6] 2022-11-24
+### Improvements
+
+- Fix JS Errors 
+- Use an unified template for Scripts
+  - Load all JS Files
+
 ## [1.0.5] 2022-11-24
 ### Improvements
 
diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 
 setup(
 name='django-theme-soft-design',
-version='1.0.5',
+version='1.0.6',
 zip_safe=False,
 packages=find_packages(),
 include_package_data=True,
diff --git a/theme_soft_design/templates/accounts/password_change.html b/theme_soft_design/templates/accounts/password_change.html
@@ -1,4 +1,4 @@
-{% extends 'layouts/base_background.html' %}
+{% extends 'layouts/base_sections.html' %}
 {% load static %}
 
 {% block title %} Soft UI Design System by Creative Tim {% endblock title %}
diff --git a/theme_soft_design/templates/accounts/password_change_done.html b/theme_soft_design/templates/accounts/password_change_done.html
@@ -1,4 +1,4 @@
-{% extends 'layouts/base_background.html' %}
+{% extends 'layouts/base_sections.html' %}
 {% load static %}
 
 {% block title %} Soft UI Design System by Creative Tim {% endblock title %}
diff --git a/theme_soft_design/templates/accounts/password_reset.html b/theme_soft_design/templates/accounts/password_reset.html
@@ -1,4 +1,4 @@
-{% extends 'layouts/base_background.html' %}
+{% extends 'layouts/base_sections.html' %}
 {% load static %}
 
 {% block title %} Soft UI Design System by Creative Tim {% endblock title %}
diff --git a/theme_soft_design/templates/accounts/password_reset_complete.html b/theme_soft_design/templates/accounts/password_reset_complete.html
@@ -1,4 +1,4 @@
-{% extends 'layouts/base_background.html' %}
+{% extends 'layouts/base_sections.html' %}
 {% load static %}
 
 {% block title %} Soft UI Design System by Creative Tim {% endblock title %}
diff --git a/theme_soft_design/templates/accounts/password_reset_confirm.html b/theme_soft_design/templates/accounts/password_reset_confirm.html
@@ -1,4 +1,4 @@
-{% extends 'layouts/base_background.html' %}
+{% extends 'layouts/base_sections.html' %}
 {% load static %}
 
 {% block title %} Soft UI Design System by Creative Tim {% endblock title %}
diff --git a/theme_soft_design/templates/accounts/password_reset_done.html b/theme_soft_design/templates/accounts/password_reset_done.html
@@ -1,4 +1,4 @@
-{% extends 'layouts/base_background.html' %}
+{% extends 'layouts/base_sections.html' %}
 {% load static %}
 
 {% block title %} Soft UI Design System by Creative Tim {% endblock title %}
diff --git a/theme_soft_design/templates/accounts/sign-in.html b/theme_soft_design/templates/accounts/sign-in.html
@@ -1,4 +1,4 @@
-{% extends 'layouts/base_background.html' %}
+{% extends 'layouts/base_sections.html' %}
 {% load static %}
 
 {% block title %} Soft UI Design System by Creative Tim {% endblock title %}
diff --git a/theme_soft_design/templates/accounts/sign-up.html b/theme_soft_design/templates/accounts/sign-up.html
@@ -1,4 +1,4 @@
-{% extends 'layouts/base_background.html' %}
+{% extends 'layouts/base_sections.html' %}
 {% load static %}
 
 {% block title %} Soft UI Design System by Creative Tim {% endblock title %}
diff --git a/theme_soft_design/templates/includes/scripts.html b/theme_soft_design/templates/includes/scripts.html
@@ -1,12 +1,21 @@
   {% load static %}
+  
+<!-- Core JS Files -->
+<script src="{% static 'js/core/popper.min.js' %}" type="text/javascript"></script>
+<script src="{% static 'js/core/bootstrap.min.js' %}" type="text/javascript"></script>
+<script src="{% static 'js/plugins/perfect-scrollbar.min.js' %}"></script>
 
-  <!--   Core JS Files   -->
-  <script src="{% static 'js/core/popper.min.js' %}" type="text/javascript"></script>
-  <script src="{% static 'js/core/bootstrap.min.js' %}" type="text/javascript"></script>
-  <script src="{% static 'js/plugins/perfect-scrollbar.min.js' %}"></script>
-  <!--  Plugin for Parallax, full documentation here: https://github.com/wagerfield/parallax  -->
-  <script src="{% static 'js/plugins/parallax.min.js' %}"></script>
-  <!-- Control Center for Material UI Kit: parallax effects, scripts for the example pages etc -->
-  <!--  Google Maps Plugin    -->
-  <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDTTfWur0PDbZWPr7Pmq8K3jiDp0_xUziI"></script>
-  <script src="{% static 'js/material-kit.min.js' %}" type="text/javascript"></script>
+<!-- Plugins -->
+<script src="{% static 'js/plugins/parallax.min.js' %}"></script>
+<script src="{% static 'js/plugins/choices.min.js' %}"></script>
+<script src="{% static 'js/plugins/countup.min.js' %}"></script>
+<script src="{% static 'js/plugins/prism.min.js' %}"></script>
+<script src="{% static 'js/plugins/flatpickr.min.js' %}"></script>
+<script src="{% static 'js/plugins/moment.min.js' %}"></script>
+<script src="{% static 'js/plugins/rellax.min.js' %}"></script>
+<script src="{% static 'js/plugins/tilt.min.js' %}"></script>
+<script src="{% static 'js/plugins/typedjs.min.js' %}"></script>
+
+<script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDTTfWur0PDbZWPr7Pmq8K3jiDp0_xUziI"></script>
+
+<script src="{% static 'js/soft-design-system.min.js' %}" type="text/javascript"></script>
diff --git a/theme_soft_design/templates/includes/scripts_sections.html b/theme_soft_design/templates/includes/scripts_sections.html
diff --git a/theme_soft_design/templates/layouts/base_sections.html b/theme_soft_design/templates/layouts/base_sections.html
diff --git a/theme_soft_design/templates/pages/about-us.html b/theme_soft_design/templates/pages/about-us.html
@@ -1,4 +1,4 @@
-{% extends 'layouts/base_background.html' %}
+{% extends 'layouts/base_sections.html' %}
 {% load static %}
 
 {% block title %} Material Kit 2 by Creative Tim {% endblock title %}
@@ -370,9 +370,6 @@ <h4>Be the first to see the news</h4>
   
   {% block javascrips %}
   
-    <!--  Plugin for TypedJS, full documentation here: https://github.com/inorganik/CountUp.js -->
-    <script src="{% static 'js/plugins/countup.min.js' %}"></script>
-
     <script>
       // get the element to animate
       var element = document.getElementById('count-stats');
diff --git a/theme_soft_design/templates/pages/author.html b/theme_soft_design/templates/pages/author.html
@@ -1,5 +1,5 @@
 
-{% extends 'layouts/base_background.html' %}
+{% extends 'layouts/base_sections.html' %}
 {% load static %}
 
 {% block title %} Material Kit 2 by Creative Tim {% endblock title %}
diff --git a/theme_soft_design/templates/pages/contact-us.html b/theme_soft_design/templates/pages/contact-us.html
@@ -1,4 +1,4 @@
-{% extends 'layouts/base_background.html' %}
+{% extends 'layouts/base_sections.html' %}
 {% load static %}
 
 {% block title %} Material Kit 2 by Creative Tim {% endblock title %}
diff --git a/theme_soft_design/templates/pages/index.html b/theme_soft_design/templates/pages/index.html
@@ -1,4 +1,4 @@
-{% extends 'layouts/base_background.html' %}
+{% extends 'layouts/base_sections.html' %}
 {% load static %}
 
 {% block title %} Material Kit 2 by Creative Tim {% endblock title %}
@@ -7087,19 +7087,6 @@ <h4 class="mb-1">Thank you for your support!</h4>
 
 {% block javascripts %}
 
-<!--  Plugin for TypedJS, full documentation here: https://github.com/inorganik/CountUp.js -->
-<script src="{% static 'js/plugins/countup.min.js' %}"></script>
-<script src="{% static 'js/plugins/choices.min.js' %}"></script>
-<script src="{% static 'js/plugins/prism.min.js' %}"></script>
-<script src="{% static 'js/plugins/highlight.min.js' %}"></script>
-<!--  Plugin for Parallax, full documentation here: https://github.com/dixonandmoe/rellax -->
-<script src="{% static 'js/plugins/rellax.min.js' %}"></script>
-<!--  Plugin for TiltJS, full documentation here: https://gijsroge.github.io/tilt.js/ -->
-<script src="{% static 'js/plugins/tilt.min.js' %}"></script>
-<!--  Plugin for Selectpicker - ChoicesJS, full documentation here: https://github.com/jshjohnson/Choices -->
-<script src="{% static 'js/plugins/choices.min.js' %}"></script>
-
-
 <script type="text/javascript">
 
   if (document.getElementById('state1')) {
diff --git a/theme_soft_design/templates/sections/attention-catchers/alerts.html b/theme_soft_design/templates/sections/attention-catchers/alerts.html
@@ -1,4 +1,4 @@
-{% extends 'layouts/base_background.html' %}
+{% extends 'layouts/base_sections.html' %}
 {% load static %}
 
 {% block title %} Soft UI Design System by Creative Tim {% endblock title %}
@@ -194,6 +194,4 @@ <h3>Alerts</h3>
 
   {% block javascripts %}
   
-    {% include 'includes/scripts_sections.html' %}
-
   {% endblock javascripts %}
diff --git a/theme_soft_design/templates/sections/attention-catchers/modals.html b/theme_soft_design/templates/sections/attention-catchers/modals.html
@@ -1,4 +1,4 @@
-{% extends 'layouts/base_background.html' %}
+{% extends 'layouts/base_sections.html' %}
 {% load static %}
 
 {% block title %} Soft UI Design System by Creative Tim {% endblock title %}
@@ -220,7 +220,6 @@ <h5 class="modal-title" id="exampleModalLabel">Your modal title</h5>
   {% endblock footer %}
 
   {% block javascripts %}
-  
-    {% include 'includes/scripts_sections.html' %}
+
 
   {% endblock javascripts %}
diff --git a/theme_soft_design/templates/sections/attention-catchers/tooltips-popovers.html b/theme_soft_design/templates/sections/attention-catchers/tooltips-popovers.html
@@ -1,4 +1,4 @@
-{% extends 'layouts/base_background.html' %}
+{% extends 'layouts/base_sections.html' %}
 {% load static %}
 
 {% block title %} Soft UI Design System by Creative Tim {% endblock title %}
@@ -226,7 +226,5 @@ <h3>Tooltips & Popovers</h3>
   {% endblock footer %}
 
   {% block javascripts %}
-  
-    {% include 'includes/scripts_sections.html' %}
 
   {% endblock javascripts %}
diff --git a/theme_soft_design/templates/sections/elements/avatars.html b/theme_soft_design/templates/sections/elements/avatars.html
@@ -1,4 +1,4 @@
-{% extends 'layouts/base_background.html' %}
+{% extends 'layouts/base_sections.html' %}
 {% load static %}
 
 {% block title %} Soft UI Design System by Creative Tim {% endblock title %}
@@ -225,7 +225,6 @@ <h3>Avatars</h3>
   {% endblock footer %}
 
   {% block javascripts %}
-  
-    {% include 'includes/scripts_sections.html' %}
+
 
   {% endblock javascripts %}
diff --git a/theme_soft_design/templates/sections/elements/badges.html b/theme_soft_design/templates/sections/elements/badges.html
@@ -1,4 +1,4 @@
-{% extends 'layouts/base_background.html' %}
+{% extends 'layouts/base_sections.html' %}
 {% load static %}
 
 {% block title %} Soft UI Design System by Creative Tim {% endblock title %}
@@ -272,7 +272,6 @@ <h3>Badges</h3>
   {% endblock footer %}
 
   {% block javascripts %}
-  
-    {% include 'includes/scripts_sections.html' %}
+
 
   {% endblock javascripts %}
diff --git a/theme_soft_design/templates/sections/elements/breadcrumbs.html b/theme_soft_design/templates/sections/elements/breadcrumbs.html
@@ -1,4 +1,4 @@
-{% extends 'layouts/base_background.html' %}
+{% extends 'layouts/base_sections.html' %}
 {% load static %}
 
 {% block title %} Soft UI Design System by Creative Tim {% endblock title %}
@@ -128,7 +128,6 @@ <h3>Breadcrumbs</h3>
   {% endblock footer %}
 
   {% block javascripts %}
-  
-    {% include 'includes/scripts_sections.html' %}
+
 
   {% endblock javascripts %}
diff --git a/theme_soft_design/templates/sections/elements/buttons.html b/theme_soft_design/templates/sections/elements/buttons.html
@@ -1,4 +1,4 @@
-{% extends 'layouts/base_background.html' %}
+{% extends 'layouts/base_sections.html' %}
 {% load static %}
 
 {% block title %} Soft UI Design System by Creative Tim {% endblock title %}
@@ -236,6 +236,4 @@ <h3>Buttons</h3>
 
   {% block javascripts %}
   
-    {% include 'includes/scripts_sections.html' %}
-
   {% endblock javascripts %}
diff --git a/theme_soft_design/templates/sections/elements/dropdowns.html b/theme_soft_design/templates/sections/elements/dropdowns.html
@@ -1,4 +1,4 @@
-{% extends 'layouts/base_background.html' %}
+{% extends 'layouts/base_sections.html' %}
 {% load static %}
 
 {% block title %} Soft UI Design System by Creative Tim {% endblock title %}
@@ -182,6 +182,4 @@ <h3>Dropdowns</h3>
 
   {% block javascripts %}
   
-    {% include 'includes/scripts_sections.html' %}
-
   {% endblock javascripts %}
diff --git a/theme_soft_design/templates/sections/elements/progress-bars.html b/theme_soft_design/templates/sections/elements/progress-bars.html
@@ -1,4 +1,4 @@
-{% extends 'layouts/base_background.html' %}
+{% extends 'layouts/base_sections.html' %}
 {% load static %}
 
 {% block title %} Soft UI Design System by Creative Tim {% endblock title %}
@@ -199,6 +199,5 @@ <h3>Progress Bars</h3>
 
   {% block javascripts %}
   
-    {% include 'includes/scripts_sections.html' %}
-
-  {% endblock javascripts %}
+  {% endblock javascripts %}
+  
diff --git a/theme_soft_design/templates/sections/elements/toggles.html b/theme_soft_design/templates/sections/elements/toggles.html
@@ -1,4 +1,4 @@
-{% extends 'layouts/base_background.html' %}
+{% extends 'layouts/base_sections.html' %}
 {% load static %}
 
 {% block title %} Soft UI Design System by Creative Tim {% endblock title %}
@@ -173,6 +173,4 @@ <h3>Toggles</h3>
 
   {% block javascripts %}
   
-    {% include 'includes/scripts_sections.html' %}
-
   {% endblock javascripts %}
diff --git a/theme_soft_design/templates/sections/elements/typography.html b/theme_soft_design/templates/sections/elements/typography.html
@@ -1,4 +1,4 @@
-{% extends 'layouts/base_background.html' %}
+{% extends 'layouts/base_sections.html' %}
 {% load static %}
 
 {% block title %} Soft UI Design System by Creative Tim {% endblock title %}
@@ -647,6 +647,4 @@ <h6 class="mb-0">H6 Soft Design System</h6>
 
   {% block javascripts %}
   
-    {% include 'includes/scripts_sections.html' %}
-
   {% endblock javascripts %}
diff --git a/theme_soft_design/templates/sections/input-areas/forms.html b/theme_soft_design/templates/sections/input-areas/forms.html
@@ -1,4 +1,4 @@
-{% extends 'layouts/base_background.html' %}
+{% extends 'layouts/base_sections.html' %}
 {% load static %}
 
 {% block title %} Soft UI Design System by Creative Tim {% endblock title %}
@@ -222,6 +222,4 @@ <h3 class="text-center">Contact us</h3>
 
   {% block javascripts %}
   
-    {% include 'includes/scripts_sections.html' %}
-
   {% endblock javascripts %}
diff --git a/theme_soft_design/templates/sections/input-areas/inputs.html b/theme_soft_design/templates/sections/input-areas/inputs.html
@@ -1,4 +1,4 @@
-{% extends 'layouts/base_background.html' %}
+{% extends 'layouts/base_sections.html' %}
 {% load static %}
 
 {% block title %} Soft UI Design System by Creative Tim {% endblock title %}
@@ -199,7 +199,5 @@ <h3>Inputs</h3>
   {% endblock footer %}
 
   {% block javascripts %}
-  
-    {% include 'includes/scripts_sections.html' %}
 
   {% endblock javascripts %}
diff --git a/theme_soft_design/templates/sections/navigation/nav-tabs.html b/theme_soft_design/templates/sections/navigation/nav-tabs.html
@@ -1,4 +1,4 @@
-{% extends 'layouts/base_background.html' %}
+{% extends 'layouts/base_sections.html' %}
 {% load static %}
 
 {% block title %} Soft UI Design System by Creative Tim {% endblock title %}
@@ -181,6 +181,4 @@ <h3>Nav Tabs</h3>
 
   {% block javascripts %}
   
-    {% include 'includes/scripts_sections.html' %}
-
   {% endblock javascripts %}
diff --git a/theme_soft_design/templates/sections/navigation/navbars.html b/theme_soft_design/templates/sections/navigation/navbars.html
@@ -1,4 +1,4 @@
-{% extends 'layouts/base_background.html' %}
+{% extends 'layouts/base_sections.html' %}
 {% load static %}
 
 {% block title %} Soft UI Design System by Creative Tim {% endblock title %}
@@ -252,7 +252,6 @@ <h3>Navbars</h3>
   {% endblock footer %}
 
   {% block javascripts %}
-  
-    {% include 'includes/scripts_sections.html' %}
+
 
   {% endblock javascripts %}
diff --git a/theme_soft_design/templates/sections/navigation/pagination.html b/theme_soft_design/templates/sections/navigation/pagination.html
diff --git a/theme_soft_design/templates/sections/page-sections/features.html b/theme_soft_design/templates/sections/page-sections/features.html
diff --git a/theme_soft_design/templates/sections/page-sections/hero-sections.html b/theme_soft_design/templates/sections/page-sections/hero-sections.html
diff --git a/theme_soft_design/templates/sections/presentation.html b/theme_soft_design/templates/sections/presentation.html

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% extends 'layouts/base_background.html' %}`
	`1`	`+{% extends 'layouts/base_sections.html' %}`
`2`	`2`	`{% load static %}`
`3`	`3`
`4`	`4`	`{% block title %} Soft UI Design System by Creative Tim {% endblock title %}`