Skip to content

Commit

Permalink
refactor: apply auto fixes from idea
Browse files Browse the repository at this point in the history
  • Loading branch information
@keriati
keriati committed Nov 14, 2022
1 parent d4f7ad8 commit b390a71
Show file tree
Hide file tree
Showing 22 changed files with 154 additions and 159 deletions.
3 changes: 0 additions & 3 deletions app/EnhancedApps.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

namespace App;

use GuzzleHttp\Client;
use GuzzleHttp\Exception\GuzzleException;

interface EnhancedApps
{
public function test();
Expand Down
1 change: 0 additions & 1 deletion app/Http/Controllers/Controller.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Routing\Controller as BaseController;
use Illuminate\Support\Facades\Auth;

class Controller extends BaseController
{
Expand Down
7 changes: 4 additions & 3 deletions app/Http/Controllers/HomeController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace App\Http\Controllers;

use Illuminate\Http\Request;
use Illuminate\Http\RedirectResponse;

class HomeController extends Controller
{
Expand All @@ -13,15 +13,16 @@ class HomeController extends Controller
*/
public function __construct()
{
parent::__construct();
$this->middleware('auth');
}

/**
* Show the application dashboard.
*
* @return \Illuminate\Http\Response
* @return RedirectResponse
*/
public function index()
public function index(): RedirectResponse
{
return redirect()->route('dash');
}
Expand Down
90 changes: 47 additions & 43 deletions app/Http/Controllers/ItemController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,33 @@
use App\Application;
use App\Item;
use App\Jobs\ProcessApps;
use App\Search;
use App\Setting;
use App\SupportedApps;
use App\User;
use Artisan;
use GrahamCampbell\GitHub\Facades\GitHub;
use GuzzleHttp\Client;
use GuzzleHttp\Exception\GuzzleException;
use GuzzleHttp\Exception\ConnectException;
use GuzzleHttp\Exception\ServerException;
use Illuminate\Contracts\View\View;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Routing\Redirector;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Route;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Facades\URL;

class ItemController extends Controller
{
public function __construct()
{
parent::__construct();
$this->middleware('allowed');
}

/**
* Display a listing of the resource on the dashboard.
*
* @return \Illuminate\Http\Response
* @return View
*/
public function dash()
public function dash(): View
{
$data['apps'] = Item::whereHas('parents', function ($query) {
$query->where('id', 0);
Expand All @@ -49,7 +49,7 @@ public function dash()
/**
* Set order on the dashboard.
*
* @return \Illuminate\Http\Response
* @return void
*/
public function setOrder(Request $request)
{
Expand All @@ -64,9 +64,10 @@ public function setOrder(Request $request)
/**
* Pin item on the dashboard.
*
* @return \Illuminate\Http\Response
* @param $id
* @return RedirectResponse
*/
public function pin($id)
public function pin($id): RedirectResponse
{
$item = Item::findOrFail($id);
$item->pinned = true;
Expand All @@ -79,9 +80,10 @@ public function pin($id)
/**
* Unpin item on the dashboard.
*
* @return \Illuminate\Http\Response
* @param $id
* @return RedirectResponse
*/
public function unpin($id)
public function unpin($id): RedirectResponse
{
$item = Item::findOrFail($id);
$item->pinned = false;
Expand All @@ -94,12 +96,12 @@ public function unpin($id)
/**
* Unpin item on the dashboard.
*
* @return \Illuminate\Http\Response
* @return RedirectResponse|View
*/
public function pinToggle($id, $ajax = false, $tag = false)
{
$item = Item::findOrFail($id);
$new = ((bool) $item->pinned === true) ? false : true;
$new = !(((bool)$item->pinned === true));
$item->pinned = $new;
$item->save();
if ($ajax) {
Expand All @@ -122,7 +124,7 @@ public function pinToggle($id, $ajax = false, $tag = false)
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
* @return View
*/
public function index(Request $request)
{
Expand All @@ -140,9 +142,9 @@ public function index(Request $request)
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
* @return View
*/
public function create()
public function create(): View
{
//
$data['tags'] = Item::ofType('tag')->orderBy('title', 'asc')->pluck('title', 'id');
Expand All @@ -155,10 +157,10 @@ public function create()
/**
* Show the form for editing the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
* @param int $id
* @return View
*/
public function edit($id)
public function edit(int $id): View
{
// Get the item
$item = Item::find($id);
Expand Down Expand Up @@ -226,7 +228,7 @@ public function storelogic($request, $id = null)
$current_user = User::currentUser();
$request->merge([
'description' => $config,
'user_id' => $current_user->id,
'user_id' => $current_user->getId(),
]);

if ($request->input('appid') === 'null') {
Expand All @@ -252,10 +254,10 @@ public function storelogic($request, $id = null)
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
* @param Request $request
* @return RedirectResponse
*/
public function store(Request $request)
public function store(Request $request): RedirectResponse
{
$this->storelogic($request);

Expand All @@ -268,22 +270,22 @@ public function store(Request $request)
/**
* Display the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
* @param int $id
* @return void
*/
public function show($id)
public function show(int $id): void
{
//
}

/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @return \Illuminate\Http\Response
* @param Request $request
* @param int $id
* @return RedirectResponse
*/
public function update(Request $request, $id)
public function update(Request $request, int $id): RedirectResponse
{
$this->storelogic($request, $id);
$route = route('dash', []);
Expand All @@ -295,10 +297,11 @@ public function update(Request $request, $id)
/**
* Remove the specified resource from storage.
*
* @param int $id
* @return \Illuminate\Http\Response
* @param Request $request
* @param int $id
* @return RedirectResponse
*/
public function destroy(Request $request, $id)
public function destroy(Request $request, int $id): RedirectResponse
{
//
$force = (bool) $request->input('force');
Expand All @@ -319,10 +322,10 @@ public function destroy(Request $request, $id)
/**
* Restore the specified resource from soft deletion.
*
* @param int $id
* @return \Illuminate\Http\Response
* @param int $id
* @return RedirectResponse
*/
public function restore($id)
public function restore(int $id): RedirectResponse
{
//
Item::withTrashed()
Expand All @@ -338,9 +341,10 @@ public function restore($id)
/**
* Return details for supported apps
*
* @return Json
* @param Request $request
* @return string|null
*/
public function appload(Request $request)
public function appload(Request $request): ?string
{
$output = [];
$appid = $request->input('app');
Expand Down Expand Up @@ -429,10 +433,10 @@ public function execute($url, $attrs = [], $overridevars = false)

try {
return $client->request($method, $url, $attrs);
} catch (\GuzzleHttp\Exception\ConnectException $e) {
} catch (ConnectException $e) {
Log::error('Connection refused');
Log::debug($e->getMessage());
} catch (\GuzzleHttp\Exception\ServerException $e) {
} catch (ServerException $e) {
Log::debug($e->getMessage());
}

Expand All @@ -441,7 +445,7 @@ public function execute($url, $attrs = [], $overridevars = false)

public function websitelookup($url)
{
$url = \base64_decode($url);
$url = base64_decode($url);
$data = $this->execute($url);

return $data->getBody();
Expand Down
1 change: 0 additions & 1 deletion app/Http/Controllers/SearchController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace App\Http\Controllers;

use App\Http\Controllers\Controller;
use App\Search;
use Illuminate\Http\Request;

Expand Down
23 changes: 12 additions & 11 deletions app/Http/Controllers/SettingsController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@

namespace App\Http\Controllers;

use App\Http\Controllers\Controller;
use App\Setting;
use App\SettingGroup;
use App\User;
use Illuminate\Contracts\View\View;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;

class SettingsController extends Controller
{
public function __construct()
{
parent::__construct();
$this->middleware('allowed');
}

/**
* @return \Illuminate\View\View
* @return View
*/
public function index()
public function index(): View
{
$settings = SettingGroup::with([
'settings',
Expand All @@ -33,9 +33,9 @@ public function index()
/**
* @param int $id
*
* @return \Illuminate\Http\RedirectResponse
* @return RedirectResponse|View
*/
public function edit($id)
public function edit(int $id)
{
$setting = Setting::find($id);
//die("s: ".$setting->label);
Expand All @@ -59,11 +59,12 @@ public function edit($id)
}

/**
* @param Request $request
* @param int $id
*
* @return \Illuminate\Http\RedirectResponse
* @return RedirectResponse
*/
public function update(Request $request, $id)
public function update(Request $request, int $id): RedirectResponse
{
$setting = Setting::find($id);
$user = $this->user();
Expand Down Expand Up @@ -104,9 +105,9 @@ public function update(Request $request, $id)
/**
* @param int $id
*
* @return \Illuminate\Http\RedirectResponse
* @return RedirectResponse
*/
public function clear($id)
public function clear(int $id): RedirectResponse
{
$user = $this->user();
$setting = Setting::find($id);
Expand Down
Loading

0 comments on commit b390a71

Please sign in to comment.