diff --git a/.gitea/workflows/build-image.yaml b/.gitea/workflows/build-image.yaml index a74e03c..04f7e29 100644 --- a/.gitea/workflows/build-image.yaml +++ b/.gitea/workflows/build-image.yaml @@ -7,7 +7,7 @@ jobs: env: IMAGE_NAME: tladle REGISTRY_NAME: gitea.sc0tt.org - GIT_TAG: 1.2.1 + GIT_TAG: 1.3 runs-on: ubuntu-latest steps: - name: Checkout diff --git a/app/Filament/Resources/TlaSuggestions/TlaSuggestionResource.php b/app/Filament/Resources/TlaSuggestions/TlaSuggestionResource.php index 4e2e49d..33d12c5 100644 --- a/app/Filament/Resources/TlaSuggestions/TlaSuggestionResource.php +++ b/app/Filament/Resources/TlaSuggestions/TlaSuggestionResource.php @@ -75,13 +75,10 @@ class TlaSuggestionResource extends Resource EditAction::make(), DeleteAction::make(), Action::make('Approve') - ->action(function (Model $record, Collection $selectedRecords) { - $selectedRecords->each( - fn (Model $selectedRecord) => $selectedRecord->update([ - 'is_active' => $record->is_active, - ]), - ); - }), + ->action(fn (TlaSuggestion $record) => $record->ApproveTla($record)) + ->requiresConfirmation() + ->modalHeading('Approve TLA') + ->modalDescription('Are you sure you want to approve this TLA?') ]) ->toolbarActions([ BulkActionGroup::make([ diff --git a/app/Models/TlaSuggestion.php b/app/Models/TlaSuggestion.php index ee2f39d..deddc94 100644 --- a/app/Models/TlaSuggestion.php +++ b/app/Models/TlaSuggestion.php @@ -12,7 +12,9 @@ class TlaSuggestion extends Model protected $fillable = ['acronym', 'hint', 'language', 'context', 'submitter']; - public static function ApproveTla() { - $tla = new Tla(); + public static function ApproveTla(TlaSuggestion $record) { + $tla = new Tla($record->toArray()); + $record->delete(); + $tla->save(); } } diff --git a/resources/js/pages/HomeView.vue b/resources/js/pages/HomeView.vue index 4b61536..cc566f1 100644 --- a/resources/js/pages/HomeView.vue +++ b/resources/js/pages/HomeView.vue @@ -15,6 +15,7 @@ guess: '', tla: '', context: '', + submitter: '', victory: false, loss: false, maxGuesses: 10, @@ -27,6 +28,7 @@ .get('/api/fetch_tla/en') .then(response => { this.hint = response.data.hint; + this.submitter = response.data.submitter; this.guesses = response.data.guesses; this.tla = response.data.tla; this.context = response.data.context; @@ -123,6 +125,10 @@

Guesses left: {{ maxGuesses - guesses.length }}


+ Suggest a TLA! diff --git a/routes/web.php b/routes/web.php index effa042..c1d137a 100644 --- a/routes/web.php +++ b/routes/web.php @@ -2,6 +2,6 @@ use Illuminate\Support\Facades\Route; -Route::any('{all}',function(){ +Route::get('{all}',function(){ return view('vue'); })->where(['all' => '.*'])->name("vue");