Merge pull request #36 from kyledoesdev/hotfix/fix-mail-from

fix mail from p2 and cleanup some code
kyledoesdev · Nov 7, 2024 · 0d941f2 · 0d941f2
2 parents 299992a + 9511620
commit 0d941f2
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 92 deletions.
diff --git a/app/Console/Commands/RankingReminderCommand.php b/app/Console/Commands/RankingReminderCommand.php
@@ -17,8 +17,6 @@ class RankingReminderCommand extends Command
 
     public function handle()
     {   
-        dispatch(new ScheduledJobIsRunning("Ranking Reminder Job"));
-
         User::query()
             ->forRankingReminders()
             ->get()

diff --git a/app/Exports/RankingsExport.php b/app/Exports/RankingsExport.php
@@ -8,16 +8,13 @@
 
 class RankingsExport implements WithMultipleSheets
 {
-    public function __construct(private Collection $rankings){}
+    public function __construct(private Collection $rankings) {}
 
-    /**
-    * @return array
-    */
     public function sheets(): array
     {
         $sheets = [];
 
-        foreach($this->rankings as $ranking) {
+        foreach ($this->rankings as $ranking) {
             $sheets[] = new SongExport($ranking->songs, $ranking->name);
         }
 

diff --git a/app/Http/Controllers/RankingDownloadController.php b/app/Http/Controllers/RankingDownloadController.php
@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers;
 
-use App\Jobs\DownloadDataJob;
 use App\Models\Ranking;
+use App\Notifications\DownloadDataNotification;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Notification;
 
 class RankingDownloadController extends Controller
 {
@@ -16,7 +16,7 @@ public function index(): JsonResponse
             ->with('songs', 'artist')
             ->get();
 
-        DownloadDataJob::dispatch($rankings, auth()->user());
+        defer(fn() => Notification::send(auth()->user(), new DownloadDataNotification($rankings)));
 
         return response()->json([
             'success' => true,

diff --git a/app/Http/Controllers/SettingsController.php → ...tp/Controllers/UserSettingsController.php b/app/Http/Controllers/SettingsController.php → ...tp/Controllers/UserSettingsController.php
@@ -9,7 +9,7 @@
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;;
 
-class SettingsController extends Controller
+class UserSettingsController extends Controller
 {
     public function destroy(UserDeletionRequest $request): JsonResponse 
     {

diff --git a/app/Jobs/DownloadDataJob.php b/app/Jobs/DownloadDataJob.php
diff --git a/app/Jobs/ScheduledJobIsRunning.php b/app/Jobs/ScheduledJobIsRunning.php
diff --git a/app/Models/Ranking.php b/app/Models/Ranking.php
@@ -120,12 +120,11 @@ public function scopeForExplorePage(Builder $query, ?string $search = null)
             ->where('is_ranked', true)
             ->where('is_public', true)
             ->when($search != null, function($query) use ($search) {
-                $query->newQuery()
-                    ->where(function($query2) use ($search) {
-                        $query2->newQuery()
-                            ->whereHas('artist', fn($q) => $q->where('artist_name', 'LIKE', "%{$search}%"))
-                            ->orWhere('name', 'LIKE', "%{$search}%");
-                    });
+                $query->where(function($query2) use ($search) {
+                    $query2->newQuery()
+                        ->whereHas('artist', fn($q) => $q->where('artist_name', 'LIKE', "%{$search}%"))
+                        ->orWhere('name', 'LIKE', "%{$search}%");
+                });
             })
             ->with('user', 'artist')
             ->with('songs', fn($q) => $q->where('rank', 1))
@@ -137,11 +136,10 @@ public function scopeForProfilePage(Builder $query, $user)
     {
         $query->newQuery()
             ->where('user_id', $user ? $user->getKey() : auth()->id())
-            ->when($user && $user->getKey() !== auth()->id(), 
-                fn($q) => $q->newQuery()
-                    ->where('is_ranked', true)
-                    ->where('is_public', true)
-            )
+            ->when($user && $user->getKey() !== auth()->id(), function($query2) {
+                $query2->where('is_ranked', true)
+                    ->where('is_public', true);
+            })
             ->with('user', 'artist')
             ->with('songs', fn($q) => $q->where('rank', 1))
             ->withCount('songs')

diff --git a/app/Notifications/DownloadDataNotification.php b/app/Notifications/DownloadDataNotification.php
@@ -25,7 +25,6 @@ public function toMail(object $notifiable): MailMessage
     {
         return (new MailMessage)
             ->markdown('emails.downloaded-data', ['notifiable' => $notifiable])
-            ->from(env("MAIL_FROM_ADDRESS"))
             ->subject("song-rank.dev - Data Download Complete")
             ->attach(Excel::download(new RankingsExport($this->rankings), 'rankings.xlsx')->getFile(), ['as' => 'rankings.xlsx']);
     }

diff --git a/composer.lock b/composer.lock
diff --git a/config/services.php b/config/services.php
@@ -1,18 +1,9 @@
 <?php
 
 return [
-
-    'mailgun' => [
-        'domain' => env('MAILGUN_DOMAIN'),
-        'secret' => env('MAILGUN_SECRET'),
-        'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'),
-        'scheme' => 'https',
-    ],
-
     'spotify' => [
         'client_id' => env('SPOTIFY_CLIENT_ID'),
         'client_secret' => env('SPOTIFY_CLIENT_SECRET'),
         'redirect' => env('SPOTIFY_REDIRECT_URI'),
     ],
-
 ];
diff --git a/resources/js/components/Explore/Explorer.vue b/resources/js/components/Explore/Explorer.vue
@@ -33,13 +33,13 @@
     </div>
 
     <div class="row d-flex jusitfy-content-center" v-else>
-        <span>TLoading Rankings...</span>
+        <span>Loading Rankings...</span>
     </div>
 
     <ul class="pagination flex justify-end p-4">
         <li v-if="ranks.prev_page_url">
             <a 
-                class="btn-primary" 
+                class="btn-primary m-2 p-2" 
                 @click.prevent="pageRankings(ranks.prev_page_url)"
                 href="#"
             >
@@ -48,7 +48,7 @@
         </li>
         <li v-if="ranks.next_page_url">
             <a 
-                class="btn-primary" 
+                class="btn-primary m-2 p-2" 
                 @click.prevent="pageRankings(ranks.next_page_url)"
                 href="#"
             >

diff --git a/routes/web.php b/routes/web.php
@@ -4,7 +4,7 @@
 use App\Http\Controllers\ProfileController;
 use App\Http\Controllers\RankingController;
 use App\Http\Controllers\RankingDownloadController;
-use App\Http\Controllers\SettingsController;
+use App\Http\Controllers\UserSettingsController;
 use App\Http\Controllers\SongPlacementController;
 use App\Http\Controllers\SpotifyAPIController;
 use App\Http\Controllers\SpotifyAuthController;
@@ -44,8 +44,8 @@
 
     /* Settings */
     Route::view('/settings', 'settings.index')->name('settings.index');
-    Route::post('/settings/update', [SettingsController::class, 'update'])->name('settings.update');
-    Route::post('/settings/destroy', [SettingsController::class, 'destroy'])->name('settings.destroy');
+    Route::post('/settings/update', [UserSettingsController::class, 'update'])->name('settings.update');
+    Route::post('/settings/destroy', [UserSettingsController::class, 'destroy'])->name('settings.destroy');
 });
 
 /* Pagination & Search routes */