Merge branch 'dev' of github.com:Abdur-rahmaanJ/shopcube into dev

Abdur-rahmaanJ · Nov 29, 2022 · d405751 · d405751
2 parents 9a50e15 + f680572
commit d405751
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 deletions.
diff --git a/src/shopcube/app.py b/src/shopcube/app.py
@@ -100,7 +100,9 @@ def create_app(config_name, configs=None):
     def devstatic(boxormodule, filename):
         if app.config["DEBUG"]:
             module_static = os.path.join(modules_path, boxormodule, "static")
-            return send_from_directory(module_static, filename=filename)
+            return send_from_directory(
+                os.path.normpath(module_static), filename=filename
+            )
 
     available_everywhere_entities = {}
 

diff --git a/src/shopcube/modules/box__bizhelp/appointment/templates/appointment/index.html b/src/shopcube/modules/box__bizhelp/appointment/templates/appointment/index.html
@@ -38,7 +38,7 @@
         var id = $(this).attr('name');
         var ask = confirm("Do you want to delete ?");
         if (ask == true) {
-            window.location.replace("/appointment/delete/" + id, "_self");
+            window.location.replace("/appointment/delete/" + $.find(id), "_self");
             return false;
         } else {
 

diff --git a/src/shopcube/modules/box__ecommerce/shop/templates/shop/product.html b/src/shopcube/modules/box__ecommerce/shop/templates/shop/product.html
@@ -40,7 +40,7 @@
 }
 </style>
 <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
-<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js" integrity="sha512-uto9mlQzrs59VwILcLiRYeLKPPbS/bT71da/OEBYEwcdNUk8jYIy+D176RYoop1Da+f9mvkYrmj5MCLZWEtQuA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 <script>
 $(function() {
     $("#slider-range").slider({

diff --git a/src/shopcube/modules/box__ecommerce/shop/templates/shop/shop.html b/src/shopcube/modules/box__ecommerce/shop/templates/shop/shop.html
@@ -12,7 +12,7 @@
     </style>
     {% include get_active_front_theme()+'/sections/resources.html'%}
      <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
-    <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js" integrity="sha512-uto9mlQzrs59VwILcLiRYeLKPPbS/bT71da/OEBYEwcdNUk8jYIy+D176RYoop1Da+f9mvkYrmj5MCLZWEtQuA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
     <script>
 
         $( function() {

diff --git a/src/shopcube/modules/box__ecommerce/shop/templates/shop/subcategory.html b/src/shopcube/modules/box__ecommerce/shop/templates/shop/subcategory.html
@@ -29,7 +29,7 @@
     </style>
     {% include get_active_front_theme()+'/sections/resources.html'%}
     <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
-    <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js" integrity="sha512-uto9mlQzrs59VwILcLiRYeLKPPbS/bT71da/OEBYEwcdNUk8jYIy+D176RYoop1Da+f9mvkYrmj5MCLZWEtQuA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
     <script>
         {% set min_max = get_min_max_subcateg(subcategory.name) %}
         $( function() {

diff --git a/src/shopcube/static/themes/front/ecommerceus/sections/drawer_head.html b/src/shopcube/static/themes/front/ecommerceus/sections/drawer_head.html
@@ -5,7 +5,7 @@
 
     $("[data-trigger]").on("click", function() {
         var trigger_id = $(this).attr('data-trigger');
-        $(trigger_id).toggleClass("show");
+        $($.find(trigger_id)).toggleClass("show");
         $('body').toggleClass("offcanvas-active");
     });
 

diff --git a/src/shopcube/static/themes/front/ecommerceus/sections/resources.html b/src/shopcube/static/themes/front/ecommerceus/sections/resources.html
@@ -23,7 +23,7 @@
 
 {%if active_page == 'index.html'%}
 <link href="https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/4.19.1/css/mdb.min.css" rel="stylesheet">
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/4.19.1/js/mdb.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/4.19.1/js/mdb.min.js" integrity="sha512-Mug9KHKmroQFMLm93zGrjhibM2z2Obg9l6qFG2qKjXEXkMp/VDkI4uju9m4QKPjWSwQ6O2qzZEnJDEeCw0Blcw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap">
 {%endif%}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">