improved 404 page + minor bug fixes

Author: nosehad

frontend/WSLocal.c

@@ -7,15 +7,6 @@
 #include <string.h>
 #include <errno.h>
 
-#define SRV_PREFIX "[\e[36m\e[1mSERV-LOCAL\e[0m] "
-#define SRV_STATIC_DIR "./assets/"
-#define SRV_BUILD_DIR "./html"
-#define SRV_404_TEMPLATE "./assets/404.nosehad"
-#define SRV_DEF_TEMPLATE "./assets/cms.nosehad"
-
-#define SRV_PAGE_CONFIG "./assets/json/pages-config.json"
-
-#define SRV_USEDEBUGMODE 2024 /* enable outomatic recompile on file change */
 
 #ifdef SRV_USEDEBUGMODE
 
@@ -50,16 +41,21 @@ SQLTree *staticFiles;
 XString static404;
 XString staticCMS;
 
-#include "PageData.h"
+#include "PageData.hpp"
 
 static struct MHD_Response *srv_response404()
 {
     return MHD_create_response_from_buffer(static404._size, (void *)static404._str, MHD_RESPMEM_PERSISTENT);
 }
 
-static struct MHD_Response *srv_responseDef()
+static struct MHD_Response *srv_responseDef(char *route)
 {
-    return MHD_create_response_from_buffer(staticCMS._size, (void *)staticCMS._str, MHD_RESPMEM_PERSISTENT);
+    PageData* data;
+    if((data = srv_optainDataForRoute(route)) == null)
+        data = srv_optainDataForRoute("/"); /* use default route */
+        
+    XString response = data->page_data;
+    return MHD_create_response_from_buffer(response._size, (void *)response._str, MHD_RESPMEM_PERSISTENT);
 }
 
 /* simple switch statement to examine content type of static file */
@@ -112,7 +108,7 @@ static enum MHD_Result srv_handleonreq(void *cls,
     /* only static allowed currently */
     if ((file = strremoveAdStart(url, "/static/")) == null)
     {
-        response = srv_responseDef();
+        response = srv_responseDef(url);
 
         int ret = MHD_queue_response(connection, MHD_HTTP_OK, response);
         MHD_destroy_response(response);
@@ -216,6 +212,8 @@ static void srv_loadFiles()
     }
     staticCMS = xstrcreatefromfiledescriptor(fd);
     close(fd);
+
+    srv_optainPageData();
 }
 
 static void _radix_srv_start()
@@ -244,7 +242,7 @@ static void srv_unloadFiles()
     // sqtr_free(staticFiles);
 
     /* custom free paradigma for SQTree, since FileData also has to be freed */
-    for (; !sqtr_local_empty(staticFiles); free(sqtr_local_popl(staticFiles)))
+    for (; !sqtr_local_empty(staticFiles);)
     {
         SQLNode *freen = sqtr_local_popl(staticFiles);
 
@@ -259,6 +257,9 @@ static void srv_unloadFiles()
         /* free entire node */
         free(freen);
     }
+
+    srv_destroyPageData();
+
     free(staticFiles);
     free(static404._str);
     free(staticCMS._str);
@@ -287,7 +288,6 @@ void radix_srv_start()
     debga(SRV_PREFIX "%s\n", __func__);
 
     _radix_srv_start();
-    srv_optainPageData();
 
     if (pthread_create(&file_check, NULL, (void *(*)(void *)) & srv_filelistener, null) != 0)
     {
@@ -301,8 +301,6 @@ void radix_srv_exit()
 {
     debga(SRV_PREFIX "%s\n", __func__);
 
-    srv_destroyPageData();
-
     if (pthread_detach(file_check) != 0) /* detach pthread */
     {
         debg(SRV_PREFIX);

frontend/assets/404.nosehad

@@ -374,21 +374,65 @@ input[type="file"] {
 .hidden {
   display: none;
 }
+        .wrap-404 {
+            display: grid;
+            border-radius: 5px;
+            padding: 90px;
+            text-align: left;
+        }
+        @media only screen and (min-width: 500px) {
+            .wrap-404 {
+                border: 2px solid #fff;
+                padding: 90px;
+            }
+        }
+        @media only screen and (max-width: 499px) {
+            .wrap-404 {
+                border-bottom: 2px solid #fff;
+                padding: 0px 31px 70px 31px;
+            }
+        }
+        .cntent-wrap {
+            text-align: center;
+        }
+        button {
+            margin-left: 3px;
+        }
+        p {
+            margin-bottom: 0px;
+            margin-left: 3px;
+        }
+        h1 {
+            margin-top: 0px;
+            margin-bottom: 3px;
+        }
+        ._404 {
+            color: #E63946;
+        }
     </style>
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link
-        href="https://fonts.googleapis.com/css2?family=Changa:[email protected]&family=Major+Mono+Display&family=Playfair+Display&display=swap"
-        rel="stylesheet">
 </head>
 <body>
-    <h1>404</h1>
-    <h5>How did you end up here idiot?</h5>
+    <div class="cntent-wrap">
+        <div class="wrap-404">
+            <p>How did you end up here?</p>
+            <h1>
+                <logo>RAdiXcHAt <span class="_404">404</span></logo>
+            </h1>
+            <div class="input-wrap">
+                <button onclick="redirect('/')"><strong id="signup-text">Go Home <svg xmlns="http://www.w3.org/2000/svg"
+                            width="16" height="16" fill="currentColor" class="bi bi-houses-fill" viewBox="0 0 16 16">
+                            <path
+                                d="M7.207 1a1 1 0 0 0-1.414 0L.146 6.646a.5.5 0 0 0 .708.708L1 7.207V12.5A1.5 1.5 0 0 0 2.5 14h.55a2.5 2.5 0 0 1-.05-.5V9.415a1.5 1.5 0 0 1-.56-2.475l5.353-5.354z" />
+                            <path
+                                d="M8.793 2a1 1 0 0 1 1.414 0L12 3.793V2.5a.5.5 0 0 1 .5-.5h1a.5.5 0 0 1 .5.5v3.293l1.854 1.853a.5.5 0 0 1-.708.708L15 8.207V13.5a1.5 1.5 0 0 1-1.5 1.5h-8A1.5 1.5 0 0 1 4 13.5V8.207l-.146.147a.5.5 0 1 1-.708-.708z" />
+                        </svg></strong></button>
+            </div>
+        </div>
+        <p>Please submit a <a onclick="redirect('/bug-report')">bug report</a> if this is not your target destination...
+        </p>
+    </div>
 </body>
 <script type="text/javascript">
-    document.addEventListener('contextmenu', function (event) {
-        event.preventDefault();
-    });
 </script>
 </html>

frontend/assets/cms.nosehad

@@ -12,6 +12,12 @@ let cms_current_location;
 let cms_document_cache = new Map();
 let cms_startup_cache = new Map();
 let cms_loaded_scripts = new Map();
+function cms_getPageFile(route) {
+    const page = cms_pages.find((page) => page['route'] === route);
+    if (page)
+        return page['static'];
+    return "/static/404.nosehad";
+}
 function cms_loadScript(uri) {
     if (cms_loaded_scripts.get(uri))
         return;
@@ -75,12 +81,7 @@ function redirect(rlocation, r = true, ps = true) {
     cms_ov_responseText = cms_document_cache.get(rlocation);
     if (cms_ov_responseText != undefined)
         return;
-    else if (rlocation.endsWith('login')) {
-        xhttp.open("GET", "/static/login.nosehad", true);
-    }
-    else {
-        xhttp.open("GET", "/static/landing.nosehad", true);
-    }
+    xhttp.open("GET", cms_getPageFile(rlocation), true);
     xhttp.send();
 }
 redirect(window.location.pathname, false);

frontend/assets/json/pages-config.json

@@ -9,7 +9,7 @@
     },
     {
         "route":"/",
-        "static": "/static/login.nosehad",
+        "static": "/static/landing.nosehad",
         "title": "Radix Chat",
         "description": "The social media chat app with a new innovative concept: Chat with EVERYONE",
         "keywords": ["Radix", "Chat", "App", "Innovative"],

frontend/html/404.html

@@ -5,25 +5,75 @@
     <title>404 - Not Found</title>
     <style>
         #include "generic/wrapper.css"
-    </style>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link
-        href="https://fonts.googleapis.com/css2?family=Changa:[email protected]&family=Major+Mono+Display&family=Playfair+Display&display=swap"
-        rel="stylesheet">
 
+        .wrap-404 {
+            display: grid;
+            border-radius: 5px;
+            padding: 90px;
+            text-align: left;
+        }
+
+        @media only screen and (min-width: 500px) {
+            .wrap-404 {
+                border: 2px solid PRIMARY_BG_2;
+                padding: 90px;
+            }
+        }
+
+        @media only screen and (max-width: 499px) {
+            .wrap-404 {
+                border-bottom: 2px solid #fff;
+                padding: 0px 31px 70px 31px;
+            }
+        }
+
+        .cntent-wrap {
+            text-align: center;
+        }
 
+        button {
+            margin-left: 3px;
+        }
+
+        p {
+            margin-bottom: 0px;
+            margin-left: 3px;
+        }
+
+        h1 {
+            margin-top: 0px;
+            margin-bottom: 3px;
+        }
+
+        ._404 {
+            color: PRIMARY_BUTTON_BG;
+        }
+    </style>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
 </head>
 
 <body>
-    <h1>404</h1>
-    <h5>How did you end up here idiot?</h5>
+    <div class="cntent-wrap">
+        <div class="wrap-404">
+            <p>How did you end up here?</p>
+            <h1>
+                <logo>RAdiXcHAt <span class="_404">404</span></logo>
+            </h1>
+            <div class="input-wrap">
+                <button onclick="redirect('/')"><strong id="signup-text">Go Home <svg xmlns="http://www.w3.org/2000/svg"
+                            width="16" height="16" fill="currentColor" class="bi bi-houses-fill" viewBox="0 0 16 16">
+                            <path
+                                d="M7.207 1a1 1 0 0 0-1.414 0L.146 6.646a.5.5 0 0 0 .708.708L1 7.207V12.5A1.5 1.5 0 0 0 2.5 14h.55a2.5 2.5 0 0 1-.05-.5V9.415a1.5 1.5 0 0 1-.56-2.475l5.353-5.354z" />
+                            <path
+                                d="M8.793 2a1 1 0 0 1 1.414 0L12 3.793V2.5a.5.5 0 0 1 .5-.5h1a.5.5 0 0 1 .5.5v3.293l1.854 1.853a.5.5 0 0 1-.708.708L15 8.207V13.5a1.5 1.5 0 0 1-1.5 1.5h-8A1.5 1.5 0 0 1 4 13.5V8.207l-.146.147a.5.5 0 1 1-.708-.708z" />
+                        </svg></strong></button>
+            </div>
+        </div>
+        <p>Please submit a <a onclick="redirect('/bug-report')">bug report</a> if this is not your target destination...
+        </p>
+    </div>
 </body>
 <script type="text/javascript">
-    document.addEventListener('contextmenu', function (event) {
-        event.preventDefault();
-    });
 </script>
 
 </html>

frontend/html/generic/Content/cms.js

@@ -1,3 +1,5 @@
+#include "../../../properties.h"
+
 let cms_pages = C_PRELOAD_CONST_PAGES;
 
 let cms_ov_responseText;
@@ -8,6 +10,14 @@ let cms_document_cache = new Map();
 let cms_startup_cache = new Map();
 let cms_loaded_scripts = new Map();
 
+/* basically used to optaion the static path for a dynamic styled route */
+function cms_getPageFile(route) {
+    const page = cms_pages.find((page) => page['route'] === route);
+    if (page)
+        return page['static'];
+    return SRV_404_ROUTE;
+}
+
 function cms_loadScript(uri) {
     if (cms_loaded_scripts.get(uri)) /* prevent script redeclaration */
         return;
@@ -92,13 +102,8 @@ function redirect(rlocation, r = true, ps = true) {
 
     if (cms_ov_responseText != undefined)
         return;
-    else if (rlocation.endsWith('login')) {
-        xhttp.open("GET", "/static/login.nosehad", true);
-    }
-    else {
-        xhttp.open("GET", "/static/landing.nosehad", true);
-    }
-
+    
+    xhttp.open("GET", cms_getPageFile(rlocation), true);
     xhttp.send();
 }
 

frontend/out/core

@@ -1,3 +1,14 @@
 //#define RADIX_MAKE_APP
 #define PORT 4564
-#define PORT_S "4564"
+#define PORT_S "4564"
+
+#define SRV_PREFIX "[\e[36m\e[1mSERV-LOCAL\e[0m] "
+#define SRV_STATIC_DIR "./assets/"
+#define SRV_BUILD_DIR "./html"
+#define SRV_404_TEMPLATE "./assets/404.nosehad"
+#define SRV_404_ROUTE "/static/404.nosehad"
+#define SRV_DEF_TEMPLATE "./assets/cms.nosehad"
+
+#define SRV_PAGE_CONFIG "./assets/json/pages-config.json"
+
+#define SRV_USEDEBUGMODE 2024 /* enable outomatic recompile on file change */