This commit is contained in:
@@ -31,13 +31,13 @@ class TlaController extends Controller
|
|||||||
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);
|
||||||
$session->put('date'.$language, date('Y-m-d'));
|
$session->put('date-'.$language, date('Y-m-d'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -53,11 +53,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,
|
||||||
'correct' => $session->get('correct'.$language),
|
'correct' => $session->get('correct-'.$language),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -107,21 +107,21 @@ 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);
|
||||||
if ($score == 12) $session->put('correct'.$language, true);
|
if ($score == 12) $session->put('correct-'.$language, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'guesses' => $guesses,
|
'guesses' => $guesses,
|
||||||
'date' => $session->get('date'),
|
'date' => $session->get('date'),
|
||||||
'tla' => $session->get('tla'.$language) == $tla_object->acronym ? $tla_object->acronym : NULL,
|
'tla' => $session->get('tla-'.$language) == $tla_object->acronym ? $tla_object->acronym : NULL,
|
||||||
'context' => $session->get('tla'.$language) == $tla_object->acronym ? $tla_object->context : NULL,
|
'context' => $session->get('tla-'.$language) == $tla_object->acronym ? $tla_object->context : NULL,
|
||||||
'score' => $score,
|
'score' => $score,
|
||||||
'correct' => $session->get('correct'.$language),
|
'correct' => $session->get('correct-'.$language),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -131,30 +131,35 @@ class TlaController extends Controller
|
|||||||
|
|
||||||
public function review(Request $request, String $language, int $type) {
|
public function review(Request $request, String $language, int $type) {
|
||||||
$session = $request->session();
|
$session = $request->session();
|
||||||
$current = $session->get('review'.$language);
|
if ($session->get('correct-'.$language) == true) {
|
||||||
$tla = Tla::GetCurrentTla($language);
|
$current = $session->get('review-'.$language);
|
||||||
|
$tla = Tla::GetCurrentTla($language);
|
||||||
|
|
||||||
if ($type != 2) {
|
if ($type != 2) {
|
||||||
if ($current == $type) {
|
if ($current == $type) {
|
||||||
if ($current == 1) $tla->likes--;
|
if ($current == 1) $tla->likes--;
|
||||||
else if ($current == -1) $tla->dislikes--;
|
else if ($current == -1) $tla->dislikes--;
|
||||||
$type = 2;
|
$type = 2;
|
||||||
} else {
|
} else {
|
||||||
if ($current == 1) $tla->likes--;
|
if ($current == 1) $tla->likes--;
|
||||||
else if ($current == -1) $tla->dislikes--;
|
else if ($current == -1) $tla->dislikes--;
|
||||||
|
|
||||||
if ($type == 1) $tla->likes++;
|
if ($type == 1) $tla->likes++;
|
||||||
else if ($type == -1) $tla->dislikes++;
|
else if ($type == -1) $tla->dislikes++;
|
||||||
}
|
}
|
||||||
$tla->save();
|
$tla->save();
|
||||||
$session->put('review'.$language, $type);
|
$session->put('review-'.$language, $type);
|
||||||
|
}
|
||||||
|
|
||||||
|
return response()->json([
|
||||||
|
'likes' => $tla->likes,
|
||||||
|
'dislikes' => $tla->dislikes,
|
||||||
|
'current' => $type,
|
||||||
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
return response()->json([
|
else return response(null, 403);
|
||||||
'likes' => $tla->likes,
|
|
||||||
'dislikes' => $tla->dislikes,
|
|
||||||
'current' => $type,
|
|
||||||
]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function update(Request $request, Tla $tla): RedirectResponse
|
public function update(Request $request, Tla $tla): RedirectResponse
|
||||||
|
|||||||
Reference in New Issue
Block a user