From b0a177fbad4364c3f01b2a23ee04672eb331900d Mon Sep 17 00:00:00 2001
From: Thomas G <62822072+Thomasluigi07@users.noreply.github.com>
Date: Tue, 7 Mar 2023 15:52:07 +1100
Subject: [PATCH] fix

---
 app/Http/Controllers/AccountController.php       | 12 ++++++++++++
 app/Http/Controllers/Auth/RegisterController.php |  7 ++++---
 resources/views/auth/register.blade.php          |  1 +
 resources/views/client/idelanding.blade.php      |  8 ++++----
 resources/views/errors/500.blade.php             |  4 ++++
 resources/views/invite/index.blade.php           |  6 ++++--
 resources/views/pages/requests.blade.php         |  4 +++-
 routes/web.php                                   |  1 +
 8 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index eb1927f..f30bde1 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -6,7 +6,10 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
 use App\Models\User;
+use App\Models\Message;
 use App\Models\UserSetting;
+use App\Models\InviteKey;
+use App\Models\FeedPost;
 
 
 class AccountController extends Controller
@@ -20,6 +23,15 @@ class AccountController extends Controller
     {
         $user = Auth::User();
 
+
+        InviteKey::where('created_by', Auth::id())->delete();
+        InviteKey::where('user_invited', Auth::id())->delete();
+
+        Message::where('user_id', Auth::id())->delete();
+        Message::where('sendto_id', Auth::id())->delete();
+
+        FeedPost::where('user_id', Auth::id())->delete();
+
         Auth::logout();
 
         $user->delete();
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index f2b3384..25d28f3 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -71,16 +71,17 @@ class RegisterController extends Controller
         $this->verifyKey($data['key']);
         $invited_by = $this->getInviter($data['key']);
         $this->updateKeyTable($data['key']);
+        
 
-        UserSetting::create(['user_id' => User::all()->last()->id+1]);
+        UserSetting::create(['user_id' => User::all()->last()->id]);
         return User::create([
             'name' => $data['name'],
             'email' => $data['email'],
             'dob' => $data['dob'],
             'password' => Hash::make($data['password']),
             'badges' => [3],
-            'invited_by' => $invited_by,
-        ]);
+            'invited_by' => $invited_by
+        ]);;
     }
 
     protected function verifyKey($key)
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index ee91db7..de410f9 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -73,4 +73,5 @@
     <br>
     <!--SU BUTTON-->
     <button class="greenbutton" onClick="this.form.submit();this.disabled=true">Sign Up</button>
+    <p class="important">If you recieve a 500 error once you sign up, please message Thomas on the discord.</p>
     @endsection
\ No newline at end of file
diff --git a/resources/views/client/idelanding.blade.php b/resources/views/client/idelanding.blade.php
index 2310647..786787a 100644
--- a/resources/views/client/idelanding.blade.php
+++ b/resources/views/client/idelanding.blade.php
@@ -17,13 +17,13 @@
                 <span id="header-or">or</span>
                 <span class="studioiFrameLogin">
                     <span id="login-span">
-                         <a href="{{ route('login') }}" class="btn-control btn-control-large header-login">Login<!-- <span class="grey-arrow">▼</span>--></a>
+                         <a class="btn-control btn-control-large header-login">Login
+                            <span class="grey-arrow">▼</span>
+                        </a>
                     </span>
-                    <!-- disabled due to bugs
                     <div id="iFrameLogin" class="studioiFrameLogin" style="display: none; background: #E1E1E1">
-                        <iframe class="login-frame" src=" route('login_iframe') " allow-scripts scrolling="no" frameborder="0"></iframe>                                  
+                        <iframe class="login-frame" src="{{ route('login_iframe') }}" allow-scripts scrolling="no" frameborder="0"></iframe>                                  
                     </div>
-                     -->
                 </span>
                 @else
                 <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display:none">
diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php
index a8fae58..7cbe935 100644
--- a/resources/views/errors/500.blade.php
+++ b/resources/views/errors/500.blade.php
@@ -11,4 +11,8 @@
 @section('contentloggedout')
 <h2>500 | Internal Server Error <button style="width: fit-content;"  class="greybutton" onclick="window.history.back();">Back</button></h2>
 <p>Please go back and try again. If it still does not work, contact one of the developers.</p>
+@auth
+<br />
+<p>Please report this error with your USERID: {{ Auth::id() }}</p>
+@endauth
 @endsection
\ No newline at end of file
diff --git a/resources/views/invite/index.blade.php b/resources/views/invite/index.blade.php
index 7609623..9b5c39b 100644
--- a/resources/views/invite/index.blade.php
+++ b/resources/views/invite/index.blade.php
@@ -26,8 +26,10 @@
             <div class="FeedContainerBox" id="FeedContainerBox1">
                 <div id="ProfileContainerBox1TextContainer">
                     <h3>Invite Key | @if (!$fKey->active)
-                            You Invited: <a href="{{ route('profile', App\Models\User::find($fKey->user_invited)->id) }}"
-                                style="font-weight:normal;color:blue">{{ App\Models\User::find($fKey->user_invited)->name }}</a>
+                            You Invited: <a href="@if (!empty(App\Models\User::find($fKey->user_invited)->id))
+                            {{ route('profile', App\Models\User::find($fKey->user_invited)->id) }}
+                            @endif" 
+                                style="font-weight:normal;color:blue">@if (!empty(App\Models\User::find($fKey->user_invited)->id)){{ App\Models\User::find($fKey->user_invited)->name }}@else[ Deleted User ]@endif</a>
                             |
                         @endif Created {{ $fKey->created_at->format('d/m/Y') }}</h3>
                     @if ($fKey->active)
diff --git a/resources/views/pages/requests.blade.php b/resources/views/pages/requests.blade.php
index 755b0d6..43fe436 100644
--- a/resources/views/pages/requests.blade.php
+++ b/resources/views/pages/requests.blade.php
@@ -5,7 +5,7 @@
 
 @section('content')
     <div class="PageTitleBar">
-    <h1 id="usernameframe">Friends</h1>
+    <h1 id="usernameframe">Friend Requests</h1>
     <div>
     <a href="{{ route('friends') }}" class="tab">All Friends</a>
     <a href="#" class="tab_selected">Pending Requests ({{ count(Auth::user()->getFriendRequests()) }})</a>
@@ -15,6 +15,7 @@
     <div class="content_special" id="FriendsContainer" style="flex-wrap: wrap;">
         @foreach ($userRequests as $userReq)
             @php $user = App\Models\User::find($userReq->sender_id) @endphp
+            @if (!empty($user))
             <div class="FriendsContainerBox" id="FriendsContainerBox1">
                 <div id="FriendsContainerBox1ImageContainer">
                     <a href="{{ route('profile', $user->id) }}"><img alt="Profile Image"
@@ -43,6 +44,7 @@
                     </div>
                 </div>
             </div>
+            @endif
         @endforeach
         @if (!count($userRequests))
             <p>You have no pending friend requests.</p>
diff --git a/routes/web.php b/routes/web.php
index 394a7d1..1b2b543 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -97,6 +97,7 @@ Route::get('/game/ChatFilter.ashx', [App\Http\Controllers\ClientController::clas
 Route::get('/game/join.ashx', [App\Http\Controllers\ClientController::class, 'join'])->name('join');
 Route::get('/IDE/Landing.aspx', [App\Http\Controllers\ClientController::class, 'idelanding'])->name('idelanding');
 Route::get('/ide/welcome', [App\Http\Controllers\ClientController::class, 'idelanding'])->name('idewelcome');
+Route::get('/ide/login', [App\Http\Controllers\ClientController::class, 'login_iframe'])->name('login_iframe');
 Route::get('/IDE/Upload.aspx', [App\Http\Controllers\ClientController::class, 'ideupload'])->name('ideupload');
 Route::get('/IDE/ClientToolbox.aspx', [App\Http\Controllers\ClientController::class, 'toolbox'])->name('toolbox');
 Route::get('/UploadMedia/PostImage.aspx', [App\Http\Controllers\ClientController::class, 'postimage'])->name('postimage');