Upgrade to latest template (#1045)

## Description

v1.5.0 of the template was released. I pulled in the changes.

## Type of change

- [x] 🌻 Feature


## Test Plan

<!-- How will this be tested prior to merging.-->
- [x] 💪 Manual

website/gulpfile.js

@@ -104,7 +104,7 @@ gulp.task('watch', function () {
     gulp.watch([paths.src.scss.files, '!' + paths.src.scss.icon], gulp.series('scss', 'browsersyncReload'));
     gulp.watch(paths.src.scss.icon, gulp.series('icons', 'browsersyncReload'));
     gulp.watch([paths.src.js.dir], gulp.series('js', 'browsersyncReload'));
-    gulp.watch([paths.src.js.pages], gulp.series('jsPages', 'browsersyncReload'));
+    // gulp.watch([paths.src.js.pages], gulp.series('jsPages', 'browsersyncReload'));
     gulp.watch([paths.src.html.files, paths.src.partials.files], gulp.series(['fileinclude', 'scss'], 'browsersyncReload'));
 });
 
@@ -115,12 +115,12 @@ gulp.task('js', function () {
         .pipe(gulp.dest(paths.dist.js.dir));
 });
 
-gulp.task('jsPages', function () {
+// gulp.task('jsPages', function () {
-    return gulp
+//     return gulp
-        .src(paths.src.js.files)
+//         .src(paths.src.js.files)
-        // .pipe(uglify())
+//         // .pipe(uglify())
-        .pipe(gulp.dest(paths.dist.js.files));
+//         .pipe(gulp.dest(paths.dist.js.files));
-});
+// });
 
 const cssOptions = {
     compatibility: "*", // (default) - Internet Explorer 10+ compatibility mode
@@ -242,7 +242,7 @@ gulp.task('html', function () {
 });
 
 // Default(Producation) Task
-gulp.task('default', gulp.series(gulp.parallel('clean:packageLock', 'clean:dist', 'copy:all', 'copy:libs', 'fileinclude', 'scss', 'icons', 'js', 'jsPages', 'html'), gulp.parallel('browsersync', 'watch')));
+gulp.task('default', gulp.series(gulp.parallel('clean:packageLock', 'clean:dist', 'copy:all', 'copy:libs', 'fileinclude', 'scss', 'icons', 'js', 'html'), gulp.parallel('browsersync', 'watch')));
 
 // Build(Development) Task
-gulp.task('build', gulp.series('clean:packageLock', 'clean:dist', 'copy:all', 'copy:libs', 'fileinclude', 'scss', 'icons', 'js', 'jsPages', 'html'));
+gulp.task('build', gulp.series('clean:packageLock', 'clean:dist', 'copy:all', 'copy:libs', 'fileinclude', 'scss', 'icons', 'js', 'html'));

website/src/assets/js/app.js

@@ -94,18 +94,29 @@ function activateMenu() {
 
         if (matchingMenuItem) {
             matchingMenuItem.classList.add('active');
+
+
             var immediateParent = getClosest(matchingMenuItem, 'li');
+
             if (immediateParent) {
                 immediateParent.classList.add('active');
             }
 
-            var parent = getClosest(matchingMenuItem, '.parent-menu-item');
+            var parent = getClosest(immediateParent, '.child-menu-item');
+            if(parent){
+                parent.classList.add('active');
+            }
+
+            var parent = getClosest(parent || immediateParent , '.parent-menu-item');
+
             if (parent) {
                 parent.classList.add('active');
+
                 var parentMenuitem = parent.querySelector('.menu-item');
                 if (parentMenuitem) {
                     parentMenuitem.classList.add('active');
                 }
+
                 var parentOfParent = getClosest(parent, '.parent-parent-menu-item');
                 if (parentOfParent) {
                     parentOfParent.classList.add('active');
@@ -250,4 +261,69 @@ try {
     new WOW().init();
 } catch (error) {
     
-}
+}
+
+
+/*************************/
+/*      Contact Js       */
+/*************************/
+
+try {
+    function validateForm() {
+        var name = document.forms["myForm"]["name"].value;
+        var email = document.forms["myForm"]["email"].value;
+        var subject = document.forms["myForm"]["subject"].value;
+        var comments = document.forms["myForm"]["comments"].value;
+        document.getElementById("error-msg").style.opacity = 0;
+        document.getElementById('error-msg').innerHTML = "";
+        if (name == "" || name == null) {
+            document.getElementById('error-msg').innerHTML = "<div class='alert alert-warning error_message'>*Please enter a Name*</div>";
+            fadeIn();
+            return false;
+        }
+        if (email == "" || email == null) {
+            document.getElementById('error-msg').innerHTML = "<div class='alert alert-warning error_message'>*Please enter a Email*</div>";
+            fadeIn();
+            return false;
+        }
+        if (subject == "" || subject == null) {
+            document.getElementById('error-msg').innerHTML = "<div class='alert alert-warning error_message'>*Please enter a Subject*</div>";
+            fadeIn();
+            return false;
+        }
+        if (comments == "" || comments == null) {
+            document.getElementById('error-msg').innerHTML = "<div class='alert alert-warning error_message'>*Please enter a Comments*</div>";
+            fadeIn();
+            return false;
+        }
+        var xhttp = new XMLHttpRequest();
+        xhttp.onreadystatechange = function () {
+            if (this.readyState == 4 && this.status == 200) {
+                document.getElementById("simple-msg").innerHTML = this.responseText;
+                document.forms["myForm"]["name"].value = "";
+                document.forms["myForm"]["email"].value = "";
+                document.forms["myForm"]["subject"].value = "";
+                document.forms["myForm"]["comments"].value = "";
+            }
+        };
+        xhttp.open("POST", "php/contact.php", true);
+        xhttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+        xhttp.send("name=" + name + "&email=" + email + "&subject=" + subject + "&comments=" + comments);
+        return false;
+    }
+
+    function fadeIn() {
+        var fade = document.getElementById("error-msg");
+        var opacity = 0;
+        var intervalID = setInterval(function () {
+            if (opacity < 1) {
+                opacity = opacity + 0.5
+                fade.style.opacity = opacity;
+            } else {
+                clearInterval(intervalID);
+            }
+        }, 200);
+    }
+} catch (error) {
+
+}

website/src/partials/cookies.html

@@ -1,5 +1,5 @@
 <!-- Start Cookie Popup -->
-<div class="cookie-popup fixed max-w-lg bottom-3 right-3 left-3 sm:left-0 sm:right-0 mx-auto bg-white dark:bg-slate-900 shadow dark:shadow-gray-800 rounded-md py-5 px-6 z-10">
+<div class="cookie-popup fixed max-w-lg bottom-3 right-3 left-3 sm:left-0 sm:right-0 mx-auto bg-white dark:bg-slate-900 shadow dark:shadow-gray-800 rounded-md py-5 px-6 z-50">
     <p class="text-slate-400">This website uses cookies to provide you with a great user experience. By using it, you accept our <a href="https://shreethemes.in" target="_blank" class="text-emerald-600 dark:text-emerald-500 font-semibold">use of cookies</a></p>
     <div class="cookie-popup-actions text-right">
         <button class="absolute border-none bg-none p-0 cursor-pointer font-semibold top-2 right-2"><i class="uil uil-times text-dark dark:text-slate-200 text-2xl"></i></button>

website/src/partials/switcher.html

@@ -1,5 +1,5 @@
 <!-- Switcher -->
-<div class="fixed top-1/4 -right-1 z-3">
+<div class="fixed top-1/4 -right-2 z-50">
     <span class="relative inline-block rotate-90">
         <input type="checkbox" class="checkbox opacity-0 absolute" id="chk" />
         <label class="label bg-slate-900 dark:bg-white shadow dark:shadow-gray-800 cursor-pointer rounded-full flex justify-between items-center p-1 w-14 h-8" for="chk">

website/src/partials/title-meta.html

@@ -1,7 +1,8 @@
 <meta charset="UTF-8" />
 <title>@@title - Free, Secure, Open-Source Backup for M365</title>
 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-<meta content="Corso, a free, secure, and open-source backup tool for Microsoft 365" name="description" />
+<meta name="description" content="Corso, a free, secure, and open-source backup tool for Microsoft 365" />
+<meta name="keywords" content="backup, microsoft 365, disaster recovery, object storage, open source, free, secure, ransomware" />
 <meta name="author" content="The Corso Backup Team" />
 <meta name="website" content="https://corsobackup.io" />
 <meta name="version" content="1.0.0" />