Merge pull request #201 from yel-hadd/master

Update 404 Not Found Page, Add new redirections

Author: Yassine El Haddad

docs/.vuepress/public/not-found.html

@@ -68,51 +68,51 @@ <h1 class="display-1">404</h1>
    </div>
    <script>
       var data = [
-      {
-      "title": "Introduction to Cloudlinux OS",
-      "description": "Introduction to CloudLinux OS editions and their description.",
-      "link": "/introduction/"
-      },
-      {
-      "title": "CloudLinux OS Legacy (Shared)",
-      "description": "CloudLinux OS Legacy (Shared) is designed for shared hosting providers. It isolates each customer into a separate “Lightweight Virtualized Environment” (LVE), which allocates and limits server resources.",
-      "link": "/legacy/cloudlinux_installation/"
-      },
-      {
-      "title": "CloudLinux OS Shared Pro",
-      "description": "CloudLinux OS Shared Pro extends your CloudLinux OS Legacy (Shared) functionality with even more useful features.",
-      "link": "/shared-pro/introduction/"
-      },
-      {
-      "title": "AccelerateWP",
-      "description": "AccelerateWP carries a suite of optimization features that can be enabled and automatically configured for the end user's site.",
-      "link": "/shared-pro/accelerate-wp/"
-      },
-      {
-      "title": "CLN",
-      "description": "CLN is a CloudLinux Network designed to easily manage your licenses of CloudLinux products and services by means of a user-friendly interface.",
-      "link": "/cln/introduction/"
-      },
-      {
-      "title": "CloudLinux Solo",
-      "description": "CloudLinux OS Solo is designed for VPS or dedicated servers with a single hosting account for any number of websites.",
-      "link": "/solo/introduction/"
-      },
-      {
-      "title": "CloudLinux OS Admin",
-      "description": "CloudLinux OS Admin is designed for shared hosting providers and allows flawless migration of big shared hosting customers to individual VPS with the same CloudLinux features as on shared hosting.",
-      "link": "/admin/description"
-      },
-      {
-      "title": "CloudLinux Subsystem For Ubuntu",
-      "description": "CloudLinux subsystem on Ubuntu is a scope of deb-packages that allows using CloudLinux features on Ubuntu OS.",
-      "link": "/ubuntu/introduction/"
-      },
-      {
-      "title": "End-user Documents",
-      "description": "Documentation section for end-users on Cloudlinux OS.",
-      "link": "/user-docs/user-docs-shared-cloudlinux/"
-      }
+         {
+             title: "Introduction to Cloudlinux OS",
+             description: "Introduction to CloudLinux OS editions and their description.",
+             link: "/introduction/",
+         },
+         {
+             title: "CloudLinux OS",
+             description: "Optimizes shared hosting environments by enhancing stability, security, and performance through user isolation and efficient resource management. Featuring tools like LVE resource limits, CageFS, and multiple language selectors, it empowers hosting providers to offer superior services. The CloudLinux OS Shared Pro edition further extends functionality with even more valuable features.",
+             link: "/cloudlinuxos/cloudlinux_installation/",
+         },
+         {
+             title: "Apache2Nginx (BETA)",
+             description: "Apache2Nginx sets up Nginx hosting with .htaccess support.",
+             link: "/cloudlinuxos/apache2nginx/",
+         },
+         {
+             title: "AccelerateWP",
+             description: "AccelerateWP carries a suite of optimization features that can be enabled and automatically configured for the end user's site.",
+             link: "/cloudlinuxos/shared-pro/accelerate-wp/",
+         },
+         {
+             title: "CLN - CloudLinux Licenses",
+             description: "CLN is a CloudLinux Network designed to easily manage your licenses of CloudLinux products and services by means of a user-friendly interface.",
+             link: "/cln/introduction/",
+         },
+         {
+             title: "CloudLinux Solo",
+             description: "CloudLinux OS Solo is designed for VPS or dedicated servers with a single hosting account for any number of websites.",
+             link: "/solo/introduction/",
+         },
+         {
+             title: "CloudLinux OS Admin",
+             description: "CloudLinux OS Admin is designed for shared hosting providers and allows flawless migration of big shared hosting customers to individual VPS with the same CloudLinux features as on shared hosting.",
+             link: "/admin/description/",
+         },
+         {
+             title: "CloudLinux Subsystem For Ubuntu",
+             description: "CloudLinux subsystem on Ubuntu is a scope of deb-packages that allows using CloudLinux features on Ubuntu OS.",
+             link: "/ubuntu/introduction/",
+         },
+         {
+             title: "End-user Documents",
+             description: "Documentation section for end-users on Cloudlinux OS.",
+             link: "/user-docs/user-docs-shared-pro-cloudlinux/",
+         }
       ];
       $(document).ready(function() {
          var row = '<div class="row">';

docs/.vuepress/routes.json

@@ -49,5 +49,7 @@
     "/user-docs/user-docs-shared-cloudlinux/#acceleratewp":"/user-docs/user-docs-shared-pro-cloudlinux/#acceleratewp",
     "/cloudlinux-os-plus":"/cloudlinuxos/shared-pro/",
     "/cloudlinuxos": "/cloudlinuxos/cloudlinux_installation/#installation",
-    "/shared": "/cloudlinuxos/"
+    "/shared": "/cloudlinuxos/",
+    "/shared-pro/accelerate-wp/#set-upgrade-url-for-cdn": "/cloudlinuxos/shared-pro/#set-upgrade-url-for-cdn",
+    "/shared-pro/accelerate-wp": "/cloudlinuxos/shared-pro/#acceleratewp"
 }

docs/.vuepress/theme/layouts/NotFound.vue

@@ -1,95 +1,58 @@
 <template>
   <div class="custom-container">
+    <iframe v-if="showIframe" :src="iframeSrc" style="width: 100%; height: 100vh; border: none;"></iframe>
   </div>
 </template>
 
-
 <script setup>
 import { useRoute, useRouter } from "vue-router";
 import { onMounted, ref } from "vue";
 import { pagesData } from "../../.temp/internal/pagesData.js";
-import redirects from './redirects.json';
 
 const route = useRoute();
 const router = useRouter();
-const allPages = ref([]);
-
-// Function to escape special characters in a string for use in a regular expression
-function escapeRegExp(string) {
-  return string.replace(/[.*+\-?^${}()|[\]\\]/g, '\\$&');
-}
-
-const redirectionURL = async () => {
-  if (route.path.startsWith('/index.html?')) {
-    // Extract the part after the ?
-    const key = route.path.split('?')[1];
-    // Check if this key exists in the redirects
-    if (key in redirects) {
-      // If it does, redirect to the associated path
-      router.push(redirects[key]);
-      return true;
-    }
-  }
-  
-  for (let [from, to] of Object.entries(redirects)) {
-    // Existing code for paths without special characters
-    const escapedFrom = escapeRegExp(from);
-    if (route.path.search(escapedFrom) !== -1) {
-      const path = route.path.replace(new RegExp(escapedFrom, 'g'), to);
-      // If match is found, return true
-      router.push(path);
-      return true;
-    }
-  }
-  // If no match is found, return false
-  return false;
-};
+const showIframe = ref(false);
+const iframeSrc = ref("");
 
 const getRecursiveLevelPath = (child, rootPath) => {
   let haveSolution = false;
 
   if (haveSolution) return;
 
-  if(child.children?.length > 0) {
+  if (child.children?.length > 0) {
     for (let h of child.children) {
-      const path = rootPath + "/" + h.link
+      const path = rootPath + "/" + h.link;
 
       if (path.search(route.path) !== -1) {
-        router.push(path)
-        haveSolution = true
+        router.push(path);
+        haveSolution = true;
         return;
       }
 
       if (child.children.length > 0) {
-        getRecursiveLevelPath(h, rootPath)
+        getRecursiveLevelPath(h, rootPath);
       }
     }
   }
 };
 
 onMounted(async () => {
-  // If a redirect was performed, stop checking the other techniques
-  if (await redirectionURL()) {
-    return;
-  }
-
-  // If no match found in JSON redirects, then check the existing techniques
   const values = Object?.values(pagesData);
 
   for (let value of values) {
     const res = await value();
-
     let rootPath = res.path;
 
-    if (rootPath.at(-1) === "/")
+    if (rootPath.at(-1) === "/") {
       rootPath = rootPath.slice(0, -1);
+    }
 
-    if(res.headers?.length > 0) {
+    if (res.headers?.length > 0) {
       for (let h of res.headers) {
-        const path = rootPath + "/" + h.link
+        const path = rootPath + "/" + h.link;
 
-        if (path.search(route.path) !== -1){
-          router.push(path)
+        if (path.search(route.path) !== -1) {
+          router.push(path);
           return;
         }
         getRecursiveLevelPath(h, rootPath);
@@ -99,15 +62,23 @@ onMounted(async () => {
 
   if (route.fullPath.startsWith('/legacy')) {
     const newPath = route.fullPath.replace('/legacy', '/cloudlinuxos');
-    // router.push(newPath);
     window.location.href = newPath;
   } else if (route.fullPath.startsWith('/shared')) {
     const newPath = route.fullPath.replace('/shared', '/cloudlinuxos');
     router.push(newPath);
     window.location.href = newPath;
   } else {
-    window.location.href = '/not-found.html';
+    // Show the iframe and set the source to 'not-found.html'
+    showIframe.value = true;
+    iframeSrc.value = '/not-found.html';
   }
-
 });
 </script>
+
+<style>
+.custom-container {
+  position: relative;
+  width: 100%;
+  height: 100vh;
+}
+</style>