From 62a27e1eb2ae16ba63b66f1fc0a098663200b934 Mon Sep 17 00:00:00 2001
From: prplwtf <hello@prpl.wtf>
Date: Sat, 17 Feb 2024 21:32:08 +0100
Subject: [PATCH] feat `views`: Either screw up everything or improve the
 codebase. (core still uses old paths, expect no worky)

---
 .../views/blueprint/admin/admin.blade.php     | 74 +++++++++++++++++++
 .../blueprint/dashboard/dashboard.blade.php   |  8 ++
 resources/views/layouts/admin.blade.php       | 56 ++------------
 .../partials/blueprint/admin/layout.blade.php |  6 --
 .../blueprint/dashboard/wrapper.blade.php     |  6 --
 resources/views/templates/wrapper.blade.php   |  4 +-
 6 files changed, 92 insertions(+), 62 deletions(-)
 create mode 100644 resources/views/blueprint/admin/admin.blade.php
 create mode 100644 resources/views/blueprint/dashboard/dashboard.blade.php
 delete mode 100644 resources/views/partials/blueprint/admin/layout.blade.php
 delete mode 100644 resources/views/partials/blueprint/dashboard/wrapper.blade.php

diff --git a/resources/views/blueprint/admin/admin.blade.php b/resources/views/blueprint/admin/admin.blade.php
new file mode 100644
index 0000000..81a509b
--- /dev/null
+++ b/resources/views/blueprint/admin/admin.blade.php
@@ -0,0 +1,74 @@
+@section("blueprint.import")
+  <link rel="stylesheet" href="https://unpkg.com/boxicons@latest/css/boxicons.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.1/font/bootstrap-icons.css">
+  <link rel="stylesheet" href="/assets/extensions/blueprint/admin.extensions.css">
+  <link rel="stylesheet" href="/assets/extensions/blueprint/blueprint.style.css">
+@endsection
+
+@section("blueprint.cache")
+  <!-- Begin Blueprint cache-refresh requirement -->
+  <div 
+    id="I0TWHOPKAB-1"
+    class="I0TWHOPKAB-1"
+    style="
+      position: fixed;
+      bottom: 0px;
+      left: 0px;
+      background: rgb(23,23,23);
+      background: linear-gradient(180deg, rgba(23,23,23,1) 0%, rgba(8,8,8,1) 100%);
+      color: white;
+      padding: 0px 10px;
+      width: 100vw;
+      z-index: 6000001;
+      height: auto;"
+    >
+    <p style="font-size: 20px;">
+      <code style="background: none; border: none; color: white !important;">[<i style="margin-left:20px">.</i> <i style="margin-right:3px">.</i>]</code>
+      <code style="background: none; border: none;">Outdated stylesheets detected.</code>
+    </p>
+  </div>
+  <!-- End Blueprint cache-refresh requirement -->
+@endsection
+
+@section("blueprint.navigation")
+  <?php
+    $extensionsIcon="fa fa-puzzle-piece";
+    if($blueprint->fileRead("::f/.blueprint/extensions/blueprint/private/db/onboarding") == "true"){
+      $extensionsIcon="fa fa-puzzle-piece bx-flashing";
+    }
+  ?>
+
+  <li>
+    <li>
+      <a href="{{ route('admin.extensions') }}" data-toggle="tooltip" data-placement="bottom" title="Extensions">
+        <i class='{{ $extensionsIcon }}'></i>
+      </a>
+    </li>
+  </li>
+@endsection
+
+@section("blueprint.notifications")
+  <?php
+    if($blueprint->fileRead("::f/.blueprint/extensions/blueprint/private/db/onboarding") == "true") {
+      $blueprint->fileWipe("::f/.blueprint/extensions/blueprint/private/db/onboarding");
+    }
+    $notification = $blueprint->dbGet("blueprint", "notification:text");
+    if($notification != null) {
+      echo "<div class=\"notification\">
+      <p>".$notification."</p>
+      </div>
+      ";
+
+      $blueprint->dbSet("blueprint", "notification:text", "");
+    }
+  ?>
+@endsection
+
+@section("blueprint.extensions")
+  <!--
+    Blueprint extensions containing admin wrappers
+    will have their wrapper code injected here.
+  -->
+
+  <!-- wrapper:insert -->
+@endsection
\ No newline at end of file
diff --git a/resources/views/blueprint/dashboard/dashboard.blade.php b/resources/views/blueprint/dashboard/dashboard.blade.php
new file mode 100644
index 0000000..73b64bf
--- /dev/null
+++ b/resources/views/blueprint/dashboard/dashboard.blade.php
@@ -0,0 +1,8 @@
+@section("blueprint.extensions")
+  <!--
+    Blueprint extensions containing dashboard wrappers
+    will have their wrapper code injected here.
+  -->
+
+  <!-- wrapper:insert -->
+@endsection
\ No newline at end of file
diff --git a/resources/views/layouts/admin.blade.php b/resources/views/layouts/admin.blade.php
index f026aec..a47f742 100644
--- a/resources/views/layouts/admin.blade.php
+++ b/resources/views/layouts/admin.blade.php
@@ -6,9 +6,12 @@
     $settings = app()->make('Pterodactyl\Contracts\Repository\SettingsRepositoryInterface');
     $blueprint = app()->make(BlueprintExtensionLibrary::class, ['settings' => $settings]);
 ?>
+@include("blueprint.admin.admin")
+
 <!DOCTYPE html>
 <html>
     <head>
+        @yield("blueprint.import")
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <title>{{ config('app.name', 'Pterodactyl') }} - @yield('title')</title>
@@ -36,10 +39,6 @@
             {!! Theme::css('css/pterodactyl.css?t={cache-version}') !!}
             <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
             <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css">
-            <link rel="stylesheet" href="https://unpkg.com/boxicons@latest/css/boxicons.min.css">
-            <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.1/font/bootstrap-icons.css">
-            <link rel="stylesheet" href="/assets/extensions/blueprint/admin.extensions.css">
-            <link rel="stylesheet" href="/assets/extensions/blueprint/blueprint.style.css">
 
             <!--[if lt IE 9]>
             <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
@@ -48,28 +47,7 @@
         @show
     </head>
     <body class="hold-transition skin-blue fixed sidebar-mini">
-        <!-- Begin Blueprint cache-refresh requirement -->
-        <div 
-          id="I0TWHOPKAB-1"
-          class="I0TWHOPKAB-1"
-          style="
-            position: fixed;
-            bottom: 0px;
-            left: 0px;
-            background: rgb(23,23,23);
-            background: linear-gradient(180deg, rgba(23,23,23,1) 0%, rgba(8,8,8,1) 100%);
-            color: white;
-            padding: 0px 10px;
-            width: 100vw;
-            z-index: 6000001;
-            height: auto;"
-        >
-          <p style="font-size: 20px;">
-            <code style="background: none; border: none; color: white !important;">[<i style="margin-left:20px">.</i> <i style="margin-right:3px">.</i>]</code>
-            <code style="background: none; border: none;">Outdated stylesheets detected.</code>
-          </p>
-        </div>
-        <!-- End Blueprint cache-refresh requirement -->
+        @yield('blueprint.cache')
         <div class="wrapper">
             <header class="main-header">
                 <a href="{{ route('index') }}" class="logo">
@@ -90,10 +68,7 @@
                                     <span class="hidden-xs">{{ Auth::user()->name_first }} {{ Auth::user()->name_last }}</span>
                                 </a>
                             </li>
-                            <li>
-                                <!-- The puzzle icon in the admin panel to manage and configure your installed extensions. -->
-                                <li><a href="{{ route('admin.extensions') }}" data-toggle="tooltip" data-placement="bottom" title="Extensions"><i class='fa fa-puzzle-piece <?php if($blueprint->fileRead("::f/.blueprint/extensions/blueprint/private/db/onboarding") == "true"){ echo "bx-flashing"; } ?>'></i></a></li>
-                            </li>
+                            @yield("blueprint.navigation")
                             <li>
                                 <li><a href="{{ route('index') }}" data-toggle="tooltip" data-placement="bottom" title="Exit Admin Control"><i class="fa fa-server"></i></a></li>
                             </li>
@@ -190,24 +165,6 @@
                         </div>
                     </div>
                     @yield('content')
-                    <?php
-
-                        // This might be further improved later.
-
-                        if($blueprint->fileRead("::f/.blueprint/extensions/blueprint/private/db/onboarding") == "true") {
-                            $blueprint->fileWipe("::f/.blueprint/extensions/blueprint/private/db/onboarding");
-                        }
-    
-                        $notification = $blueprint->dbGet("blueprint", "notification:text");
-                        if($notification != null) {
-                            echo "<div class=\"notification\">
-                            <p>".$notification."</p>
-                            </div>
-                            ";
-    
-                            $blueprint->dbSet("blueprint", "notification:text", "");
-                        }
-                    ?>
                 </section>
             </div>
             <footer class="main-footer">
@@ -266,6 +223,7 @@
                 })
             </script>
         @show
-        @include('partials.blueprint.admin.layout')
+        @yield('blueprint.notifications')
+        @yield('blueprint.extensions')
     </body>
 </html>
diff --git a/resources/views/partials/blueprint/admin/layout.blade.php b/resources/views/partials/blueprint/admin/layout.blade.php
deleted file mode 100644
index 8364ba9..0000000
--- a/resources/views/partials/blueprint/admin/layout.blade.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<!--
-  Blueprint extensions containing admin wrappers
-  will have their wrapper code injected here.
--->
-
-<!-- wrapper:insert -->
\ No newline at end of file
diff --git a/resources/views/partials/blueprint/dashboard/wrapper.blade.php b/resources/views/partials/blueprint/dashboard/wrapper.blade.php
deleted file mode 100644
index 6049f24..0000000
--- a/resources/views/partials/blueprint/dashboard/wrapper.blade.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<!--
-  Blueprint extensions containing dashboard wrappers
-  will have their wrapper code injected here.
--->
-
-<!-- wrapper:insert -->
\ No newline at end of file
diff --git a/resources/views/templates/wrapper.blade.php b/resources/views/templates/wrapper.blade.php
index d6463a2..714f3cd 100644
--- a/resources/views/templates/wrapper.blade.php
+++ b/resources/views/templates/wrapper.blade.php
@@ -3,6 +3,8 @@
     $settings = app()->make('Pterodactyl\Contracts\Repository\SettingsRepositoryInterface');
     $blueprint = app()->make(BlueprintExtensionLibrary::class, ['settings' => $settings]);
 ?>
+@include('blueprint.dashboard.dashboard')
+
 <!DOCTYPE html>
 <html>
     <head>
@@ -53,7 +55,7 @@
             @yield('container')
             @yield('below-container')
             
-            @include('partials.blueprint.dashboard.wrapper')
+            @yield('blueprint.extensions')
         @show
         @section('scripts')
             {!! $asset->js('main.js') !!}