diff --git a/docker-compose.yml b/docker-compose.yml index a2663b1..373d72e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -35,7 +35,7 @@ services: - "traefik.docker.network=proxy" # Entry Point for https - "traefik.http.routers.podcastartgen-secure.entrypoints=websecure" - - "traefik.http.routers.podcastartgen-secure.rule=Host(`new.noagendaartgenerator.com`)" + - "traefik.http.routers.podcastartgen-secure.rule=Host(`www.noagendaartgenerator.com`) || HOST(`noagendaartgenerator.com`)" - "traefik.http.routers.podcastartgen-secure.service=podcastartgen-service" - "traefik.http.services.podcastartgen-service.loadbalancer.server.port=80" links: diff --git a/site/app/Http/Controllers/ArtistController.php b/site/app/Http/Controllers/ArtistController.php index e50bebf..5d55c2d 100644 --- a/site/app/Http/Controllers/ArtistController.php +++ b/site/app/Http/Controllers/ArtistController.php @@ -31,11 +31,6 @@ public function index() ]); } - public function avatar() { - $user = auth()->user(); - return view('') - } - /** * Show the form for creating a new resource. * diff --git a/site/app/Http/Controllers/ArtworkController.php b/site/app/Http/Controllers/ArtworkController.php index f62a400..4fb14b6 100644 --- a/site/app/Http/Controllers/ArtworkController.php +++ b/site/app/Http/Controllers/ArtworkController.php @@ -30,7 +30,7 @@ public function index() ->with('artist') ->orderBy('episode_id', 'desc') ->orderBy('created_at', 'desc') - ->paginate($perPage = 92, $columns = ['*'], $pageName = 'artworks'); + ->paginate($perPage = 54, $columns = ['*'], $pageName = 'artworks'); $podcasts = Podcast::where('published', true)->with('episodes')->get(); return view('explore.artworks', [ 'user' => $user, diff --git a/site/app/Http/Controllers/PageController.php b/site/app/Http/Controllers/PageController.php index 0a4dd93..e0a4aa0 100644 --- a/site/app/Http/Controllers/PageController.php +++ b/site/app/Http/Controllers/PageController.php @@ -38,7 +38,7 @@ private function mostRecentSubmissions() { ->with('episode') ->with('podcast') ->orderBy('created_at', 'desc') - ->limit(50) + ->limit(10) ->get(); }); return $artworks; @@ -53,7 +53,7 @@ private function mostRecentEpisodes() ->with('artwork') ->with('artwork.artist') ->orderBy('episode_date', 'desc') - ->limit(10) + ->limit(5) ->get(); }); return $episodes; diff --git a/site/app/Models/Artist.php b/site/app/Models/Artist.php index b8ba6ed..7e1f7a9 100644 --- a/site/app/Models/Artist.php +++ b/site/app/Models/Artist.php @@ -64,7 +64,7 @@ public function wallets() public function avatar() { if (!$this->avatar) { - return asset('resources/img/default_avatars/default_avatar_male.svg'); + return config('app.static_asset_url') . '/' . ('avatars/default_avatar_male.svg'); } return config('app.static_asset_url') . '/' . $this->avatar; } diff --git a/site/resources/views/artworks/card.blade.php b/site/resources/views/artworks/card.blade.php index 790e9e3..0b0ef57 100644 --- a/site/resources/views/artworks/card.blade.php +++ b/site/resources/views/artworks/card.blade.php @@ -35,7 +35,7 @@ class="avatar" data-bs-toggle="tooltip" data-bs-placement="top" title="{{ $thisArtwork->artist->name }}"> - {{ $thisArtwork->artist->name }} diff --git a/site/resources/views/explore/artworks.blade.php b/site/resources/views/explore/artworks.blade.php index 4f7bbc6..958cfcd 100644 --- a/site/resources/views/explore/artworks.blade.php +++ b/site/resources/views/explore/artworks.blade.php @@ -18,6 +18,18 @@ @endsection @section('page-content') +
+
+
+
+

+ NOTE: Still working out some bugs, episodes 1613-1616 will be added later today + after the show. You can find those submissions here: https://noagenda.dev/old/ +

+
+
+
+
diff --git a/site/resources/views/home/leaderboard/card.blade.php b/site/resources/views/home/leaderboard/card.blade.php index 938f64a..a148be3 100644 --- a/site/resources/views/home/leaderboard/card.blade.php +++ b/site/resources/views/home/leaderboard/card.blade.php @@ -2,25 +2,25 @@
{{-- End .thumb-wrapper --}} {{-- End .thumb --}}
-

{{ $leaderboardArtist->artist->name }}

+

{{ $leaderboardArtist->artist->name }}

Chosen {{ $leaderboardArtist->artworkCount }} {{ Str::plural('Time', $leaderboardArtist->artworkCount) }}
{{-- End .content --}}
{{-- End .d-flex-center --}} - + {{ $leaderboardArtist->position }}{{ numberSuffix($leaderboardArtist->position) }} Place
{{-- End .top-seller-style-two --}}
-{{-- End .col --}} \ No newline at end of file +{{-- End .col --}} diff --git a/site/resources/views/partials/nav/head.blade.php b/site/resources/views/partials/nav/head.blade.php index 8f8a948..0b5c22c 100644 --- a/site/resources/views/partials/nav/head.blade.php +++ b/site/resources/views/partials/nav/head.blade.php @@ -58,7 +58,7 @@ @if (Auth::user() && Auth::user()->artists->first() && Auth::user()->artists->first()->avatar) src="{{ Auth::user()->artists->first()->avatar() }}" @else - src="{{ Vite::asset('resources/img/default_avatars/default_avatar_male.svg') }}" + src="{{ config('app.static_asset_url') . '/' . ('avatars/default_avatar_male.svg') }}" @endif alt="user avatar">
diff --git a/site/resources/views/profile/partials/single-artist-card.blade.php b/site/resources/views/profile/partials/single-artist-card.blade.php index c16c743..9e4b7ef 100644 --- a/site/resources/views/profile/partials/single-artist-card.blade.php +++ b/site/resources/views/profile/partials/single-artist-card.blade.php @@ -3,7 +3,7 @@ {{ $artist->name }}'s Cover Photo
- {{ $artist->name }}

{{ $artist->name }}

{{ $artist->location ?? 'No Agenda Nation' }}