Skip to content

Commit b9c0b38

Browse files
committed
Turned ll home page into one function
1 parent 03db265 commit b9c0b38

File tree

2 files changed

+7
-19
lines changed

2 files changed

+7
-19
lines changed

app/Http/Controllers/UserController.php

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -77,26 +77,14 @@ public function index()
7777
//Show littlelink page. example => http://127.0.0.1:8000/+admin
7878
public function littlelink(request $request)
7979
{
80-
$littlelink_name = $request->littlelink;
81-
$id = User::select('id')->where('littlelink_name', $littlelink_name)->value('id');
8280

83-
if (empty($id)) {
84-
return abort(404);
81+
if(env('HOME_URL') !== ""){
82+
$littlelink_name = env('HOME_URL');
83+
$id = User::select('id')->where('littlelink_name', $littlelink_name)->value('id');
84+
}else{
85+
$littlelink_name = $request->littlelink;
86+
$id = User::select('id')->where('littlelink_name', $littlelink_name)->value('id');
8587
}
86-
87-
$userinfo = User::select('id', 'name', 'littlelink_name', 'littlelink_description', 'theme', 'role')->where('id', $id)->first();
88-
$information = User::select('name', 'littlelink_name', 'littlelink_description', 'theme')->where('id', $id)->get();
89-
90-
$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();
91-
92-
return view('littlelink', ['userinfo' => $userinfo, 'information' => $information, 'links' => $links, 'littlelink_name' => $littlelink_name]);
93-
}
94-
95-
//Show littlelink page as home page if set in config
96-
public function littlelinkhome(request $request)
97-
{
98-
$littlelink_name = env('HOME_URL');
99-
$id = User::select('id')->where('littlelink_name', $littlelink_name)->value('id');
10088

10189
if (empty($id)) {
10290
return abort(404);

routes/web.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
$custom_home_page_url = "/home";
6161
}
6262
if(env('HOME_URL') != '') {
63-
Route::get('/', [UserController::class, 'littlelinkhome'])->name('littlelink');
63+
Route::get('/', [UserController::class, 'littlelink'])->name('littlelink');
6464
if(config('advanced-config.disable_home_page') == 'redirect') {
6565
Route::get($custom_home_page_url, function () {return redirect(config('advanced-config.redirect_home_page'));});
6666
}elseif(config('advanced-config.disable_home_page') != 'true') {

0 commit comments

Comments
 (0)