1.3 from staging #5

Merged
Belupeti merged 6 commits from dev into master 2026-08-22 10:16:40 +02:00
13 changed files with 279 additions and 76 deletions
+1 -1
View File
@@ -7,7 +7,7 @@ jobs:
env: env:
IMAGE_NAME: tladle IMAGE_NAME: tladle
REGISTRY_NAME: gitea.sc0tt.org REGISTRY_NAME: gitea.sc0tt.org
GIT_TAG: 1.2 GIT_TAG: 1.3
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
@@ -0,0 +1,19 @@
<?php
namespace App\Filament\Resources\TlaSuggestions\Pages;
use App\Filament\Resources\TlaSuggestions\TlaSuggestionResource;
use Filament\Actions\CreateAction;
use Filament\Resources\Pages\ManageRecords;
class ManageTlaSuggestions extends ManageRecords
{
protected static string $resource = TlaSuggestionResource::class;
protected function getHeaderActions(): array
{
return [
CreateAction::make(),
];
}
}
@@ -0,0 +1,96 @@
<?php
namespace App\Filament\Resources\TlaSuggestions;
use App\Filament\Resources\TlaSuggestions\Pages\ManageTlaSuggestions;
use App\Models\TlaSuggestion;
use BackedEnum;
use Filament\Actions\BulkActionGroup;
use Filament\Actions\DeleteAction;
use Filament\Actions\DeleteBulkAction;
use Filament\Actions\EditAction;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Components\Textarea;
use Filament\Resources\Resource;
use Filament\Schemas\Schema;
use Filament\Support\Icons\Heroicon;
use Filament\Tables\Columns\TextColumn;
use Filament\Tables\Table;
use Filament\Actions\Action;
class TlaSuggestionResource extends Resource
{
protected static ?string $model = TlaSuggestion::class;
protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedRectangleStack;
protected static ?string $recordTitleAttribute = 'Suggestions';
public static function form(Schema $schema): Schema
{
return $schema
->components([
TextInput::make('acronym')
->required(),
TextInput::make('hint')
->default(null),
Select::make('language')
->options(['hu' => 'Hu', 'en' => 'En'])
->required(),
Textarea::make('context')
->default(null)
->columnSpanFull(),
TextInput::make('submitter')
->default(null),
]);
}
public static function table(Table $table): Table
{
return $table
->recordTitleAttribute('Suggestions')
->columns([
TextColumn::make('acronym')
->searchable(),
TextColumn::make('hint')
->searchable(),
TextColumn::make('language')
->badge(),
TextColumn::make('submitter')
->searchable(),
TextColumn::make('created_at')
->dateTime()
->sortable()
->toggleable(isToggledHiddenByDefault: true),
TextColumn::make('updated_at')
->dateTime()
->sortable()
->toggleable(isToggledHiddenByDefault: true),
])
->filters([
//
])
->recordActions([
EditAction::make(),
DeleteAction::make(),
Action::make('Approve')
->action(fn (TlaSuggestion $record) => $record->ApproveTla($record))
->requiresConfirmation()
->modalHeading('Approve TLA')
->modalDescription('Are you sure you want to approve this TLA?')
])
->toolbarActions([
BulkActionGroup::make([
DeleteBulkAction::make(),
]),
]);
}
public static function getPages(): array
{
return [
'index' => ManageTlaSuggestions::route('/'),
];
}
}
+20 -2
View File
@@ -25,7 +25,7 @@ class TlaResource extends Resource
protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedRectangleStack; protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedRectangleStack;
protected static ?string $recordTitleAttribute = 'tla'; protected static ?string $recordTitleAttribute = 'Tla';
public static function form(Schema $schema): Schema public static function form(Schema $schema): Schema
{ {
@@ -42,13 +42,23 @@ class TlaResource extends Resource
Textarea::make('context') Textarea::make('context')
->default(null) ->default(null)
->columnSpanFull(), ->columnSpanFull(),
TextInput::make('submitter')
->default(null),
TextInput::make('likes')
->required()
->numeric()
->default(0),
TextInput::make('dislikes')
->required()
->numeric()
->default(0),
]); ]);
} }
public static function table(Table $table): Table public static function table(Table $table): Table
{ {
return $table return $table
->recordTitleAttribute('tla') ->recordTitleAttribute('Tla')
->columns([ ->columns([
TextColumn::make('acronym') TextColumn::make('acronym')
->searchable(), ->searchable(),
@@ -59,6 +69,14 @@ class TlaResource extends Resource
TextColumn::make('used') TextColumn::make('used')
->date() ->date()
->sortable(), ->sortable(),
TextColumn::make('submitter')
->searchable(),
TextColumn::make('likes')
->numeric()
->sortable(),
TextColumn::make('dislikes')
->numeric()
->sortable(),
TextColumn::make('created_at') TextColumn::make('created_at')
->dateTime() ->dateTime()
->sortable() ->sortable()
+20 -44
View File
@@ -3,37 +3,17 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Models\Tla; use App\Models\Tla;
use App\Models\TlaSuggestion;
use Illuminate\Http\Request; use Illuminate\Http\Request;
class TlaController extends Controller class TlaController extends Controller
{ {
public function store(Request $request): RedirectResponse
{
$request->validate([
'title' => 'required',
'body' => 'required',
]);
$tla = new Tla($requestData);
$tla->save();
return redirect()->route('admin')->with('success', 'Record added!');
} //
public function destroy(Tla $tla): RedirectResponse
{
$tla->delete();
return redirect()->route('admin')->with('success', 'Record deleted');
}
public function session_flush(Request $request, string $language) public function session_flush(Request $request, string $language)
{ {
$session = $request->session(); $session = $request->session();
if ($session->get('date-'.$language, NULL) != date('Y-m-d')) if ($session->get('date-'.$language, NULL) != date('Y-m-d'))
{ {
$session->forget('guesses--'.$language); $session->forget('guesses-'.$language);
$session->forget('tla-'.$language); $session->forget('tla-'.$language);
$session->forget('correct-'.$language); $session->forget('correct-'.$language);
$session->forget('review-'.$language); $session->forget('review-'.$language);
@@ -53,10 +33,11 @@ class TlaController extends Controller
return response()->json([ return response()->json([
'hint' => $tla->hint, 'hint' => $tla->hint,
'guesses' => $session->get('guesses--'.$language, []), 'guesses' => $session->get('guesses-'.$language, []),
'date' => $session->get('date--'.$language), 'date' => $session->get('date-'.$language),
'tla' => $session->get('tla-'.$language) == $tla->acronym ? $tla->acronym : NULL, 'tla' => $session->get('tla-'.$language) == $tla->acronym ? $tla->acronym : NULL,
'context' => $session->get('tla-'.$language) == $tla->acronym ? $tla->context : NULL, 'context' => $session->get('tla-'.$language) == $tla->acronym ? $tla->context : NULL,
'submitter' => $tla->submitter,
'correct' => $session->get('correct-'.$language), 'correct' => $session->get('correct-'.$language),
]); ]);
} }
@@ -107,8 +88,8 @@ class TlaController extends Controller
$score += $guess_array[$i + 3]; $score += $guess_array[$i + 3];
} }
$session->push('guesses--'.$language, $guess_array); $session->push('guesses-'.$language, $guess_array);
$guesses = $session->get('guesses--'.$language, NULL); $guesses = $session->get('guesses-'.$language, NULL);
if ($score == 12 || count($guesses) == env('MAX_GUESSES', 10)) { if ($score == 12 || count($guesses) == env('MAX_GUESSES', 10)) {
$session->put('tla-'.$language, $tla_object->acronym); $session->put('tla-'.$language, $tla_object->acronym);
@@ -125,8 +106,19 @@ class TlaController extends Controller
]); ]);
} }
public function suggestion(?String $language = "en") { public function suggestion(Request $request, ?String $language = "en") {
$request->validate([
'acronym' => 'required',
'hint' => 'required',
'context' => 'required',
]);
$requestData = $request->input();
$tla = new TlaSuggestion($requestData);
$tla->save();
return response($tla);
} }
public function review(Request $request, String $language, int $type) { public function review(Request $request, String $language, int $type) {
@@ -161,20 +153,4 @@ class TlaController extends Controller
else return response(null, 403); else return response(null, 403);
} }
public function update(Request $request, Tla $tla): RedirectResponse
{
$request->validate([
'title' => 'required',
'body' => 'required',
]);
$requestData = $request->all();
$tla->update($requestData);
$tla->save();
return redirect()->route('admin')->with('success', 'Record updated!');
}
} }
+1 -1
View File
@@ -11,7 +11,7 @@ class Tla extends Model
use HasFactory; use HasFactory;
protected $fillable = ['acronym', 'hint', 'language', 'used', 'context', 'likes', 'dislikes']; protected $fillable = ['acronym', 'hint', 'language', 'used', 'context', 'submitter', 'likes', 'dislikes'];
public static function GetCurrentTla( string $language ) : Tla { public static function GetCurrentTla( string $language ) : Tla {
$tla = Tla::where('used', date("Y-m-d")) $tla = Tla::where('used', date("Y-m-d"))
+9 -1
View File
@@ -3,10 +3,18 @@
namespace App\Models; namespace App\Models;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Factories\HasFactory;
class TlaSuggestion extends Model class TlaSuggestion extends Model
{ {
use HasFactory;
protected $table = 'tla_suggestion'; protected $table = 'tla_suggestion';
protected $fillable = ['acronym', 'hint', 'language', 'context']; protected $fillable = ['acronym', 'hint', 'language', 'context', 'submitter'];
public static function ApproveTla(TlaSuggestion $record) {
$tla = new Tla($record->toArray());
$record->delete();
$tla->save();
}
} }
@@ -0,0 +1,29 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('tla_suggestion', function (Blueprint $table){
$table->string('submitter')->nullable()->after('context');
});
Schema::table('tla', function (Blueprint $table){
$table->string('submitter')->nullable()->after('context');
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
//
}
};
+12 -5
View File
@@ -2,7 +2,7 @@
import axios from 'axios'; import axios from 'axios';
import GuessWord from '../components/GuessWord.vue'; import GuessWord from '../components/GuessWord.vue';
import Modal from '../components/Modal.vue'; import Modal from '../components/Modal.vue';
import Review from '../components/Review.vue'; import Review from '../components/Review.vue';
</script> </script>
<script lang="ts"> <script lang="ts">
@@ -15,6 +15,7 @@ import Review from '../components/Review.vue';
guess: '', guess: '',
tla: '', tla: '',
context: '', context: '',
submitter: '',
victory: false, victory: false,
loss: false, loss: false,
maxGuesses: 10, maxGuesses: 10,
@@ -27,6 +28,7 @@ import Review from '../components/Review.vue';
.get('/api/fetch_tla/en') .get('/api/fetch_tla/en')
.then(response => { .then(response => {
this.hint = response.data.hint; this.hint = response.data.hint;
this.submitter = response.data.submitter;
this.guesses = response.data.guesses; this.guesses = response.data.guesses;
this.tla = response.data.tla; this.tla = response.data.tla;
this.context = response.data.context; this.context = response.data.context;
@@ -38,7 +40,6 @@ import Review from '../components/Review.vue';
onSubmit() { onSubmit() {
if (this.words.length == 3 && this.guesses.length < this.maxGuesses) { if (this.words.length == 3 && this.guesses.length < this.maxGuesses) {
console.log(this.words)
axios axios
.post("/api/check_tla/en", { .post("/api/check_tla/en", {
guess: this.words, guess: this.words,
@@ -94,7 +95,6 @@ import Review from '../components/Review.vue';
</template> </template>
<template #footer>
<template v-if="guesses.length < maxGuesses && !correct"> <template v-if="guesses.length < maxGuesses && !correct">
<div class="flex-container" v-if="guess.length > 0"> <div class="flex-container" v-if="guess.length > 0">
@@ -123,9 +123,15 @@ import Review from '../components/Review.vue';
<Review/> <Review/>
</template> </template>
<h3>Guesses left: {{ maxGuesses - guesses.length }}</h3> <h3>Guesses left: {{ maxGuesses - guesses.length }}</h3>
</UCard>
<br>
<template v-if="submitter != ''">
Todays TLA was submitted by <b>{{ submitter }}</b>
<br><br>
</template> </template>
</UCard> <UButton to="/suggestion" color="neutral" variant="subtle">
Suggest a TLA!
</UButton>
<Modal v-model:open="victory"> <Modal v-model:open="victory">
<h1>Congratulations!</h1> <h1>Congratulations!</h1>
@@ -139,6 +145,7 @@ import Review from '../components/Review.vue';
<h3>The context of todays TLA:</h3> <h3>The context of todays TLA:</h3>
{{ context }} {{ context }}
</Modal> </Modal>
</template> </template>
+69 -19
View File
@@ -1,24 +1,41 @@
<script setup lang="ts">
import Modal from '../components/Modal.vue';
</script>
<template> <template>
<h1>TLA suggestion form</h1> <h1>TLA suggestion form</h1>
<UCard> <br>
<UForm class="space-y-4" style="text-align: left;" action="/api/suggestion" method="post"> <UCard class="align-center">
<UFormField class="form-field" label="Acronym" required>
<UInput class="w-80" placeholder="Enter your TLA" name="tla"></UInput> <UForm @submit="onSubmit" class="space-y-4" action="/api/suggestion" method="post">
</UFormField> <UFormField class="form-field" label="Acronym" required>
<UFormField label="Motto" required> <UInput v-model="form.acronym" class="w-80" placeholder="Enter your TLA" name="tla"></UInput>
<UInput class="w-80" placeholder="Enter the motto for your TLA"></UInput> </UFormField>
</UFormField> <UFormField label="Motto" required>
<UFormField label="Contex" required> <UInput class="w-80" v-model="form.hint" placeholder="Enter the motto for your TLA" name="hint"></UInput>
<UTextarea class="w-80" rows=5 placeholder="Provide context for your TLA. This will be displayed upon completing the riddle of the day, either by guessing it correctly, or by running out of guesses."></UTextarea> </UFormField>
</UFormField> <UFormField label="Contex" required>
<UFormField> <UTextarea class="w-80" v-model="form.context" name="context" rows=5 placeholder="Provide context for your TLA. This will be displayed upon completing the riddle of the day, either by guessing it correctly, or by running out of guesses."></UTextarea>
<URadioGroup orientation="horizontal" variant="table" size="xs" default-value="en" :items="['en', 'hu']" /> </UFormField>
</UFormField> <UFormField required>
<UButton type="submit"> <URadioGroup orientation="horizontal" v-model="form.language" name="language" variant="table" size="xs" default-value="en" :items="['en', 'hu']" />
Submit suggestion </UFormField>
</UButton> <UFormField class="form-field" label="Submitter (your name)">
</UForm> <UInput v-model="form.submitter" class="w-80" placeholder="Anonymus" name="submitter"></UInput>
</UCard> </UFormField>
<UButton type="submit">
Submit suggestion
</UButton>
</UForm>
<br>
Disclaimer: I'm going through these manually, approving them or even changing the context or motto for them, if I feel it's necessary. I don't guarantee, that your suggestion will be approved and even if it is, it may not be next days TLA.
</UCard>
<Modal v-model:open="submited">
<b>Your suggestion has been submitted!</b><br>
If you wish, you can submit adnother TLA by exiting this alert. <br><br>
<UButton to="/">Main page</UButton>
</Modal>
</template> </template>
@@ -32,5 +49,38 @@
</style> </style>
<script lang="ts"> <script lang="ts">
import axios from 'axios';
export default {
data() {
return {
form: {
acronym: '',
hint: '',
context: '',
language: '',
submitter: '',
},
submited: false,
};
},
methods: {
onSubmit() {
axios.post('/api/suggestion/en', this.form).then( response => {
if (response.status == 200)
{
this.form.acronym = '';
this.form.hint = '';
this.form.context = '';
this.form.submitter = '';
this.form.language = 'en';
this.submited = true;
}
});
}
}
}
</script> </script>
+1 -1
View File
@@ -12,7 +12,7 @@
<!-- Dark mode favicon --> <!-- Dark mode favicon -->
<link rel="icon" href="{{ asset('logo_full_tall_dark.svg') }}" type="image/x-icon" media="(prefers-color-scheme: dark)"> <link rel="icon" href="{{ asset('logo_full_tall_dark.svg') }}" type="image/x-icon" media="(prefers-color-scheme: dark)">
<title>TLAdle</title> <title>{{ config('app.name') }}</title>
@vite(['resources/js/app.js']) @vite(['resources/js/app.js'])
</head> </head>
<body> <body>
+1 -1
View File
@@ -7,7 +7,7 @@ Route::middleware('web')->group(function () {
Route::resource('people', \App\Http\Controllers\TlaController::class); Route::resource('people', \App\Http\Controllers\TlaController::class);
Route::get('fetch_tla/{language?}', [\App\Http\Controllers\TlaController::class, 'fetch_tla']); Route::get('fetch_tla/{language?}', [\App\Http\Controllers\TlaController::class, 'fetch_tla']);
Route::post('check_tla/{language?}', [\App\Http\Controllers\TlaController::class, 'check_tla']); Route::post('check_tla/{language?}', [\App\Http\Controllers\TlaController::class, 'check_tla']);
Route::post('suggestion /{language?}', [\App\Http\Controllers\TlaController::class, 'suggestion']); Route::post('suggestion/{language?}', [\App\Http\Controllers\TlaController::class, 'suggestion']);
Route::get('fetch_dev', function() { Route::get('fetch_dev', function() {
return response()->json(['dev' => env('DEV_MESSAGE', false)]); return response()->json(['dev' => env('DEV_MESSAGE', false)]);
}); });
+1 -1
View File
@@ -2,6 +2,6 @@
use Illuminate\Support\Facades\Route; use Illuminate\Support\Facades\Route;
Route::any('{all}',function(){ Route::get('{all}',function(){
return view('vue'); return view('vue');
})->where(['all' => '.*'])->name("vue"); })->where(['all' => '.*'])->name("vue");