tidying up styles

OpenSourceOrg · Feb 18, 2025 · f8e939a · f8e939a
1 parent 1fdab3a
commit f8e939a
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 64 deletions.
diff --git a/themes/osi/functions.php b/themes/osi/functions.php
@@ -444,26 +444,33 @@ function osi_register_block_template() {
     // Enqueue styles conditionally
     add_action('wp_enqueue_scripts', function () use ($template_slug) {
         if (get_page_template_slug() === 'templates/ai-template.html') {
-            // Font Awesome
-            wp_enqueue_style('fontawesome', 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css', [], null);
-
-            // Swiper
-            wp_enqueue_style('swiper', 'https://opensourceorg.github.io/ai/assets/css/plugins/swiper.css', [], null);
-
-            // Unicons
-            wp_enqueue_style('unicons', 'https://opensourceorg.github.io/ai/assets/css/plugins/unicons.css', [], null);
-
-            // Metismenu
-            wp_enqueue_style('metismenu', 'https://opensourceorg.github.io/ai/assets/css/plugins/metismenu.css', [], null);
-
-            // Animate CSS
-            wp_enqueue_style('animate', 'https://opensourceorg.github.io/ai/assets/css/vendor/animate.css', [], null);
-
-            // Bootstrap
-            wp_enqueue_style('bootstrap', 'https://opensourceorg.github.io/ai/assets/css/vendor/bootstrap.min.css', [], null);
-
-            // Custom Style
-            wp_enqueue_style('custom-style', 'https://opensourceorg.github.io/ai/assets/css/style.css', [], null);
+            // Font Awesome - Updated to latest version
+            wp_enqueue_style('fontawesome', 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css', array(), '6.5.1');
+
+            // Other CSS files
+            wp_enqueue_style('swiper', 'https://opensourceorg.github.io/ai/assets/css/plugins/swiper.css', array(), '1.0.0');
+            wp_enqueue_style('unicons', 'https://opensourceorg.github.io/ai/assets/css/plugins/unicons.css', array(), '1.0.0');
+            wp_enqueue_style('metismenu', 'https://opensourceorg.github.io/ai/assets/css/plugins/metismenu.css', array(), '1.0.0');
+            wp_enqueue_style('animate', 'https://opensourceorg.github.io/ai/assets/css/vendor/animate.css', array(), '1.0.0');
+            wp_enqueue_style('bootstrap', 'https://opensourceorg.github.io/ai/assets/css/vendor/bootstrap.min.css', array(), '1.0.0');
+            wp_enqueue_style('ai-custom', 'https://opensourceorg.github.io/ai/assets/css/style.css', array('bootstrap'), '1.0.0');
+
+            // JavaScript files - with proper dependencies
+            wp_enqueue_script('jquery');
+            wp_enqueue_script('jqueryui', 'https://opensourceorg.github.io/ai/assets/js/vendor/jqueryui.js', array('jquery'), '1.0.0', true);
+            wp_enqueue_script('counter-up', 'https://opensourceorg.github.io/ai/assets/js/plugins/counter-up.js', array('jquery'), '1.0.0', true);
+            wp_enqueue_script('swiper-js', 'https://opensourceorg.github.io/ai/assets/js/plugins/swiper.js', array('jquery'), '1.0.0', true);
+            wp_enqueue_script('metismenu-js', 'https://opensourceorg.github.io/ai/assets/js/plugins/metismenu.js', array('jquery'), '1.0.0', true);
+            wp_enqueue_script('waypoint', 'https://opensourceorg.github.io/ai/assets/js/vendor/waypoint.js', array('jquery'), '1.0.0', true);
+            wp_enqueue_script('waw', 'https://opensourceorg.github.io/ai/assets/js/vendor/waw.js', array('jquery'), '1.0.0', true);
+            wp_enqueue_script('gsap', 'https://opensourceorg.github.io/ai/assets/js/plugins/gsap.min.js', array(), '1.0.0', true);
+            wp_enqueue_script('scrolltrigger', 'https://opensourceorg.github.io/ai/assets/js/plugins/scrolltigger.js', array('gsap'), '1.0.0', true);
+            wp_enqueue_script('split-text', 'https://opensourceorg.github.io/ai/assets/js/vendor/split-text.js', array('gsap'), '1.0.0', true);
+            wp_enqueue_script('contact-form', 'https://opensourceorg.github.io/ai/assets/js/vendor/contact.form.js', array('jquery'), '1.0.0', true);
+            wp_enqueue_script('split-type', 'https://opensourceorg.github.io/ai/assets/js/vendor/split-type.js', array(), '1.0.0', true);
+            wp_enqueue_script('jquery-timepicker', 'https://opensourceorg.github.io/ai/assets/js/plugins/jquery-timepicker.js', array('jquery'), '1.0.0', true);
+            wp_enqueue_script('bootstrap-js', 'https://opensourceorg.github.io/ai/assets/js/plugins/bootstrap.min.js', array('jquery'), '1.0.0', true);
+            wp_enqueue_script('ai-main', 'https://opensourceorg.github.io/ai/assets/js/main.js', array('jquery', 'bootstrap-js'), '1.0.0', true);
         }
     });
 }

diff --git a/themes/osi/templates/ai-fse.php b/themes/osi/templates/ai-fse.php
@@ -14,31 +14,11 @@
 
 
     <?php
-    if ( is_user_logged_in() ) {
-        wp_enqueue_style('admin-bar');
-        wp_enqueue_script('admin-bar');
-     	wp_print_styles('admin-bar');
-	}
-
-    wp_enqueue_style('fontawesome', 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css', [], null);
-
-    // Swiper
-    wp_enqueue_style('swiper', 'https://opensourceorg.github.io/ai/assets/css/plugins/swiper.css', [], null);
-
-    // Unicons
-    wp_enqueue_style('unicons', 'https://opensourceorg.github.io/ai/assets/css/plugins/unicons.css', [], null);
-
-    // Metismenu
-    wp_enqueue_style('metismenu', 'https://opensourceorg.github.io/ai/assets/css/plugins/metismenu.css', [], null);
-
-    // Animate CSS
-    wp_enqueue_style('animate', 'https://opensourceorg.github.io/ai/assets/css/vendor/animate.css', [], null);
-
-    // Bootstrap
-    wp_enqueue_style('bootstrap', 'https://opensourceorg.github.io/ai/assets/css/vendor/bootstrap.min.css', [], null);
-
-    // Custom Style
-    wp_enqueue_style('custom-style', 'https://opensourceorg.github.io/ai/assets/css/style.css', [], null);
+        if ( is_user_logged_in() ) {
+            wp_enqueue_style('admin-bar');
+            wp_enqueue_script('admin-bar');
+            wp_print_styles('admin-bar');
+        }
     ?>
 
 
@@ -476,24 +456,5 @@
 
     <div id="anywhere-home" class="">
     </div>
-
-
-    <!-- jquery js -->
-    <script src="https://opensourceorg.github.io/ai/assets/js/plugins/jquery.min.js"></script>
-    <script src="https://opensourceorg.github.io/ai/assets/js/vendor/jqueryui.js"></script>
-    <script src="https://opensourceorg.github.io/ai/assets/js/plugins/counter-up.js"></script>
-    <script src="https://opensourceorg.github.io/ai/assets/js/plugins/swiper.js"></script>
-    <script src="https://opensourceorg.github.io/ai/assets/js/plugins/metismenu.js"></script>
-    <script src="https://opensourceorg.github.io/ai/assets/js/vendor/waypoint.js"></script>
-    <script src="https://opensourceorg.github.io/ai/assets/js/vendor/waw.js"></script>
-    <script src="https://opensourceorg.github.io/ai/assets/js/plugins/gsap.min.js"></script>
-    <script src="https://opensourceorg.github.io/ai/assets/js/plugins/scrolltigger.js"></script>
-    <script src="https://opensourceorg.github.io/ai/assets/js/vendor/split-text.js"></script>
-    <script src="https://opensourceorg.github.io/ai/assets/js/vendor/contact.form.js"></script>
-    <script src="https://opensourceorg.github.io/ai/assets/js/vendor/split-type.js"></script>
-    <script src="https://opensourceorg.github.io/ai/assets/js/plugins/jquery-timepicker.js"></script>
-    <script src="https://opensourceorg.github.io/ai/assets/js/plugins/bootstrap.min.js"></script>
-    <script src="https://opensourceorg.github.io/ai/assets/js/main.js"></script>
-    <!-- header style two End -->
 </body>
 </html>