Merge branch 'main' of https://github.com/Thomasluigi07/MORBLOX-WEBSITE

public/css/NewAdminCSS.css

@@ -175,6 +175,7 @@ h6 {
 }
 .NewPanel .SearchCloseBtn{
   color: #af1400;
+  transition: .1s linear;
   left: auto;
   margin-left: -105px;
   margin-top: 1px;
@@ -344,29 +345,67 @@ h6 {
   height: 12px;
   display: block;
   float: right;
-  top: -6px;
+  top: -12px;
   position: relative;
   border-radius: 50%;
 }
 .NewPanel .website {
   background: linear-gradient(0deg, #0087e0 0%, #005085 49%,#005a85 50%, #0099ff 95%, #fff 100%);
+  border: 2px solid #111;
   width: 12px;
   height: 12px;
   display: block;
   border-radius: 50%;
-  margin: -5px;
+  margin: -8px;
 }
 .NewPanel .offline {
   background: linear-gradient(0deg, #a3a3a3 0%, #7a7a7a 49%, #797979 50%, #c9c9c9 95%, #fff 100%);
+  border: 2px solid #111;
   width: 12px;
   height: 12px;
   display: block;
   border-radius: 50%;
-  margin: -5px;
+  margin: -8px;
 }
 .NewPanel.AdminPanel .flex {
   display: table!important;
 }
+.NewPanel .InvitationUserName {
+  text-align: center;
+  margin-top: 20px;
+  font-size: 20px;
+  font-weight: 600;
+  display: block;
+}
+.NewPanel .InvitationSubName {
+  text-align: center;
+  font-size: 18px;
+  font-weight: 100;
+}
+.NewPanel .InvitationSubName .InvitationText {
+  display: inline-block;
+  font-weight: 100;
+  cursor: default;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+.NewPanel .InvitationSubText {
+  text-align: center;
+  cursor: default;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+.NewPanel .InvitationSubName li {
+  list-style: none;
+}
 
 @media (max-width:1000px) {
   .NewPanel .AdminSubHeader ul {

resources/views/admin/tree.blade.php

@@ -14,28 +14,43 @@
 @endsection
 
 @section('Body')
-<div id="Body" style="width: 970px;">
+    <div id="Body" style="width: 970px;">
-<h2 class="MainHeader">
+        <h2 class="MainHeader">
-    Invite Tree
+            Invite Tree
-</h2>
+        </h2>
-<div class="Userlist">
+        @if (!request()->has('q'))
-<form method="GET" action="{{ route('admin_tree') }}">
+            <h5 class="SubHeader">Enter a Username or ID.</h5>
-<div>
+        @elseif (!$user)
-<input type="text" id="SearchInput" name="q" placeholder="Search" value="{{ request()->q }}">
+            <h5 class="SubHeader text-error">Unable to find user, please check if you entered the correct information.</h5>
-@if (request()->query('q'))
+        @endif
-<a href="{{ route('admin_tree') }}" class="SearchCloseBtn">X</a>
+        <div class="Userlist">
-@endif
+            <form method="GET" action="{{ route('admin_tree') }}">
-</input>
+                <div>
-<button class="btn-neutral btn-small" name="searchBy" value="name">Search by Username</button>
+                    <input type="text" id="SearchInput" name="q" placeholder="Search" value="{{ request()->q }}">
-<button class="btn-neutral btn-small" name="searchBy" value="id">Search by ID</button>
+                    @if (request()->query('q'))
-</div>
+                        <a href="{{ route('admin_tree') }}" class="SearchCloseBtn">X</a>
-</form>
+                    @endif
-@if ($user)
+                    <button class="btn-neutral btn-small" name="searchBy" value="name" type="submit">Search by
-<div class="UserList">
+                        Username</button>
-</div>
+                    <button class="btn-neutral btn-small" name="searchBy" value="id" type="submit">Search by
-@endif
+                        ID</button>
-</div>
+                </div>
-</div>
+            </form>
+            @if ($user)
+            <a class="InvitationUserName AuthenticatedUserName" href="{{ route('profile', $user->id) }}">{{ $user->name }}</a>
+            <div class="InvitationSubName">
+            <h4 class="InvitationText">Invited By </h4>
+            <a href="{{ route('profile', App\Models\User::where('name', $invited_by)->first()->id) }}" class="AuthenticatedUserName">{{ $invited_by }}</a>
+            <h5 class="InvitationSubText">{{ $user->name }} Invited</h5>
+            @foreach ($children as $child)
+            <li>
+            <a href="{{ route('profile', $child->id) }}" target="_blank" class="AuthenticatedUserName">{{ $child->name }}</a>
+            </li>
+            @endforeach
+            </div>
+            @endif
+        </div>
+    </div>
 @endsection
 @section('content')
     <div id="UserList">
@@ -55,15 +70,16 @@
                 <h2>User Found: {{ $user->name }}</h2>
                 <ul>
                     <li>
-                        <h3><a
+                        <h3><a href="{{ route('profile', App\Models\User::where('name', $invited_by)->first()->id) }}"
-                                href="{{ route('profile', App\Models\User::where('name', $invited_by)->first()->id) }}" target="_blank">{{ $invited_by }}</a>
+                                target="_blank">{{ $invited_by }}</a>
                         </h3>
                     </li>
                     <ul>
                         <li><a href="{{ route('profile', $user->id) }}" target="_blank">{{ $user->name }}</a></li>
                         <ul>
                             @foreach ($children as $child)
-                                <li><a href="{{ route('profile', $child->id) }}" target="_blank">{{ $child->name }}</a></li>
+                                <li><a href="{{ route('profile', $child->id) }}" target="_blank">{{ $child->name }}</a>
+                                </li>
                             @endforeach
                         </ul>
                     </ul>

resources/views/admin/users.blade.php

@@ -24,7 +24,6 @@
 @if (request()->query('q'))
 <a href="{{ route('admin_users') }}" class="SearchCloseBtn">X</a>
 @endif
-</input>
 <button class="btn-neutral btn-small" name="searchBy" value="name">Search by Username</button>
 <button class="btn-neutral btn-small" name="searchBy" value="id">Search by ID</button>
 </div>
@@ -131,12 +130,12 @@
                 {{ Auth::user()->getMutualFriendsCount($user) }}
             </a>
         </div>
-        <div class="Row hidden">
+        <div class="Row">
             <div class="text-secondary">
                 Total Badges :
             </div>
             <a class="text-secondary">
-                N/A
+                {{ sizeof($user->badges) }}
             </a>
         </div>
         <div class="Row hidden">

resources/views/layouts/admin.blade.php

@@ -23,7 +23,7 @@
 <body>
     @yield('alert')
 
-    <div id="MasterContainer" class="AdminPanel" style="width: 100%;">
+    <div id="MasterContainer" class="NewPanel AdminPanel" style="width: 100%;">
     <div id="AdminWrapper" class="Navigation">
         <div class="AdminHeader">
             <span class="SiteBrand" href="{{ route('home') }}">

resources/views/layouts/app.blade.php

@@ -104,7 +104,7 @@
             @default
             @endswitch
             @endauth
-            <a id="logo_full" href="{{ route('home') }}"><img alt="ARCHBLOX Logo" class = "btn-logo" src="{{ asset('img/MORBLOXlogo.png') }}"/></a>
+            <a id="logo_full" href="{{ route('home') }}"><img alt="ARCHBLOX Logo" class="btn-logo" src="{{ asset('img/MORBLOXlogo.png') }}"/></a>
             <a id="logo_small" href="{{ route('home') }}"><img alt="ARCHBLOX Logo"
                     src="{{ asset('img/MORBLOXlogoshort.png') }}"/></a>
             <div id="NewRedesign" class="navbarbuttoncontainer NavigationRedesign">