From 7dce109163cd50a73115b6638b621852294de677 Mon Sep 17 00:00:00 2001
From: Julian Prieber <60265788+JulianPrieber@users.noreply.github.com>
Date: Wed, 9 Nov 2022 18:07:50 +0100
Subject: [PATCH] Update UserController.php

---
 app/Http/Controllers/UserController.php | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 7f7599f..1f0c125 100755
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -93,21 +93,17 @@ class UserController extends Controller
     //Show littlelink page as home page if set in config
     public function littlelinkhome(request $request)
     {
-
         $littlelink_name = env('HOME_URL');
         $id = User::select('id')->where('littlelink_name', $littlelink_name)->value('id');
 
         if (empty($id)) {
             return abort(404);
         }
-
-        $userinfo = User::select('name', 'littlelink_name', 'littlelink_description', 'image', 'theme')->where('id', $id)->first();
-        $information = User::select('name', 'littlelink_name', 'littlelink_description', 'image', 'theme')->where('id', $id)->get();
-
-        $links = DB::table('links')
-            ->where('user_id', $id)
-            ->orderBy('up_link', 'asc')->orderBy('order', 'asc')
-            ->get();
+     
+        $userinfo = User::select('name', 'littlelink_name', 'littlelink_description', 'theme')->where('id', $id)->first();
+        $information = User::select('name', 'littlelink_name', 'littlelink_description', 'theme')->where('id', $id)->get();
+        
+        $links = DB::table('links')->join('buttons', 'buttons.id', '=', 'links.button_id')->select('links.link', 'links.id', 'links.button_id', 'links.title', 'links.custom_css', 'links.custom_icon', 'buttons.name')->where('user_id', $id)->orderBy('up_link', 'asc')->orderBy('order', 'asc')->get();
 
         return view('littlelink', ['userinfo' => $userinfo, 'information' => $information, 'links' => $links, 'littlelink_name' => $littlelink_name]);
     }