Merge branch 'dev' of github.com:bunkerity/bunkerweb into dev

src/ui/static/css/dashboard.css

@@ -815,14 +815,14 @@ h6 {
   right: 1.25rem;
 }
 
-.right-2 {
-  right: 0.5rem;
-}
-
 .top-16 {
   top: 4rem;
 }
 
+.right-2 {
+  right: 0.5rem;
+}
+
 .top-\[60px\] {
   top: 60px;
 }
@@ -978,6 +978,11 @@ h6 {
   margin-bottom: 0.25rem;
 }
 
+.mx-4 {
+  margin-left: 1rem;
+  margin-right: 1rem;
+}
+
 .mx-2\.5 {
   margin-left: 0.625rem;
   margin-right: 0.625rem;
@@ -3382,6 +3387,11 @@ h6 {
     grid-column: span 8 / span 8;
   }
 
+  .lg\:mx-0 {
+    margin-left: 0px;
+    margin-right: 0px;
+  }
+
   .lg\:mx-8 {
     margin-left: 2rem;
     margin-right: 2rem;

src/ui/static/js/global.js

@@ -8,6 +8,20 @@ class Menu {
 
     this.toggleBtn.addEventListener("click", this.toggle.bind(this));
     this.closeBtn.addEventListener("click", this.close.bind(this));
+    this.init();
+  }
+
+  init() {
+    window.addEventListener("click", (e) => {
+      try {
+        if (
+          e.target.closest("aside").hasAttribute("sidebar-menu") &&
+          e.target.closest("button").getAttribute("role") === "tab"
+        ) {
+          this.close();
+        }
+      } catch (err) {}
+    });
   }
 
   toggle() {
@@ -26,21 +40,15 @@ class News {
   }
 
   init() {
-    window.addEventListener("load", () => {
-      const res = fetch("https://www.bunkerweb.io/api/posts/0/1", {
-        headers: {
-          method: "GET",
-          Accept: "application/json",
-          "Content-Type": "application/json",
-        },
-      })
-        .then((res) => {
-          console.log("data");
-          const data = res.data;
-          console.log(data);
-          this.render(res);
-        })
-        .catch((err) => console.log(err));
+    window.addEventListener("load", async () => {
+      try {
+        const res = await fetch("https://www.bunkerweb.io/api/posts/0/2", {
+          headers: {
+            method: "GET",
+          },
+        });
+        return await this.render(res);
+      } catch (err) {}
     });
   }
 

src/ui/templates/login.html

@@ -71,7 +71,7 @@
     <main class="grid grid-cols-2 align-middle items-center min-h-screen">
       <!--form -->
       <div
-        class="col-span-2 lg:col-span-1 bg-none lg:bg-gray-50 h-full flex flex-col items-center justify-center"
+        class="mx-4 lg:mx-0 col-span-2 lg:col-span-1 bg-none lg:bg-gray-50 h-full flex flex-col items-center justify-center"
       >
         <div class="bg-gray-50 rounded px-12 py-16 w-full max-w-[400px]">
           <div class="flex justify-center">

src/ui/templates/menu.html

@@ -29,7 +29,7 @@
   <!-- close btn-->
   <svg
     sidebar-menu-close
-    class="sm:hidden cursor-pointer fill-gray-600 dark:fill-gray-300 dark:opacity-80 absolute h-8 w-8 top-2 right-2"
+    class="sm:hidden cursor-pointer fill-gray-600 dark:fill-gray-300 dark:opacity-80 absolute h-6 w-6 top-4 right-4"
     xmlns="http://www.w3.org/2000/svg"
     viewBox="0 0 320 512"
   >