diff --git a/app/Http/Livewire/Project/New/GithubPrivateRepository.php b/app/Http/Livewire/Project/New/GithubPrivateRepository.php
index 73b07984b..09ae573f3 100644
--- a/app/Http/Livewire/Project/New/GithubPrivateRepository.php
+++ b/app/Http/Livewire/Project/New/GithubPrivateRepository.php
@@ -42,6 +42,13 @@ class GithubPrivateRepository extends Component
public bool $is_static = false;
public string|null $publish_directory = null;
+ public function mount()
+ {
+ $this->parameters = get_parameters();
+ $this->query = request()->query();
+ $this->repositories = $this->branches = collect();
+ $this->github_apps = GithubApp::private();
+ }
protected function loadRepositoryByPage()
{
$response = Http::withToken($this->token)->get("{$this->github_app->api_url}/installation/repositories?per_page=100&page={$this->page}");
@@ -152,11 +159,4 @@ class GithubPrivateRepository extends Component
}
$this->emit('saved', 'Application settings updated!');
}
- public function mount()
- {
- $this->parameters = get_parameters();
- $this->query = request()->query();
- $this->repositories = $this->branches = collect();
- $this->github_apps = GithubApp::private();
- }
}
diff --git a/app/Models/GithubApp.php b/app/Models/GithubApp.php
index df76efcf5..6c858a35d 100644
--- a/app/Models/GithubApp.php
+++ b/app/Models/GithubApp.php
@@ -41,10 +41,10 @@ class GithubApp extends BaseModel
}
static public function public()
{
- return GithubApp::where('team_id', session('currentTeam')->id)->where('is_public', true)->get();
+ return GithubApp::whereTeamId(session('currentTeam')->id)->whereisPublic(true)->whereNotNull('app_id')->get();
}
static public function private()
{
- return GithubApp::where('team_id', session('currentTeam')->id)->where('is_public', false)->get();
+ return GithubApp::whereTeamId(session('currentTeam')->id)->whereisPublic(false)->whereNotNull('app_id')->get();
}
}
diff --git a/resources/views/source/all.blade.php b/resources/views/source/all.blade.php
index 6ca3fca40..d251ab163 100644
--- a/resources/views/source/all.blade.php
+++ b/resources/views/source/all.blade.php
@@ -9,7 +9,11 @@