0.1.1
This commit is contained in:
@@ -33,7 +33,7 @@ class AuthenticatedSessionController extends Controller
|
||||
|
||||
$request->session()->regenerate();
|
||||
|
||||
return redirect()->intended(route('dashboard', absolute: false));
|
||||
return redirect()->intended(route('comics.index'));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -36,6 +36,6 @@ class ConfirmablePasswordController extends Controller
|
||||
|
||||
$request->session()->put('auth.password_confirmed_at', time());
|
||||
|
||||
return redirect()->intended(route('dashboard', absolute: false));
|
||||
return redirect()->intended(route('comics.index'));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ class EmailVerificationNotificationController extends Controller
|
||||
public function store(Request $request): RedirectResponse
|
||||
{
|
||||
if ($request->user()->hasVerifiedEmail()) {
|
||||
return redirect()->intended(route('dashboard', absolute: false));
|
||||
return redirect()->intended(route('comics.index'));
|
||||
}
|
||||
|
||||
$request->user()->sendEmailVerificationNotification();
|
||||
|
||||
@@ -16,7 +16,7 @@ class EmailVerificationPromptController extends Controller
|
||||
public function __invoke(Request $request): RedirectResponse|Response
|
||||
{
|
||||
return $request->user()->hasVerifiedEmail()
|
||||
? redirect()->intended(route('dashboard', absolute: false))
|
||||
? redirect()->intended(route('comics.index'))
|
||||
: Inertia::render('Auth/VerifyEmail', ['status' => session('status')]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -48,6 +48,6 @@ class RegisteredUserController extends Controller
|
||||
|
||||
Auth::login($user);
|
||||
|
||||
return redirect(route('dashboard', absolute: false));
|
||||
return redirect(route('comics.index'));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,13 +15,13 @@ class VerifyEmailController extends Controller
|
||||
public function __invoke(EmailVerificationRequest $request): RedirectResponse
|
||||
{
|
||||
if ($request->user()->hasVerifiedEmail()) {
|
||||
return redirect()->intended(route('dashboard', absolute: false).'?verified=1');
|
||||
return redirect()->intended(route('comics.index'));
|
||||
}
|
||||
|
||||
if ($request->user()->markEmailAsVerified()) {
|
||||
event(new Verified($request->user()));
|
||||
}
|
||||
|
||||
return redirect()->intended(route('dashboard', absolute: false).'?verified=1');
|
||||
return redirect()->intended(route('comics.index'));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -64,8 +64,8 @@ class ComicController extends Controller
|
||||
public function postFavourite(Request $request): JsonResponse
|
||||
{
|
||||
try {
|
||||
// Get pathname to comic_id
|
||||
$comic = Comic::where('pathword', $request->pathword)->firstOrFail();
|
||||
// Get pathname to comic_id, if metadata is null, also do fetching
|
||||
$comic = Comic::where('pathword', $request->pathword)->whereNotNull('metadata')->firstOrFail();
|
||||
} catch (ModelNotFoundException $e) {
|
||||
// Fetch from remote
|
||||
$remoteComic = $this->copyManga->comic($request->pathword);
|
||||
@@ -345,9 +345,13 @@ class ComicController extends Controller
|
||||
// Update history
|
||||
$request->user()->readingHistories()->attach($chapterObj->id, ['comic_id' => $comicObj->id]);
|
||||
|
||||
// Get chapters from DB
|
||||
$chapters = $comicObj->chapters()->where('metadata->group_path_word', $chapter['chapter']['group_path_word'])->orderBy('order')->get(['name', 'chapter_uuid']);
|
||||
|
||||
return Inertia::render('Comic/Read', [
|
||||
'comic' => $this->scToZh($comic),
|
||||
'chapter' => $this->scToZh($chapter),
|
||||
'chapters' => $this->scToZh($chapters),
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -385,6 +389,13 @@ class ComicController extends Controller
|
||||
return redirect()->route('comics.histories');
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove histories for specified comic
|
||||
*
|
||||
* @param Request $request
|
||||
* @param string $pathword
|
||||
* @return Response
|
||||
*/
|
||||
public function destroyHistory(Request $request, string $pathword): Response
|
||||
{
|
||||
$comicId = Comic::where('pathword', $pathword)->firstOrFail(['id'])->id;
|
||||
@@ -399,6 +410,12 @@ class ComicController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove duplicated records
|
||||
*
|
||||
* @param Request $request
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function destroyHistories(Request $request): RedirectResponse
|
||||
{
|
||||
$result = $request->user()->cleanUpReadingHistories();
|
||||
|
||||
@@ -43,7 +43,6 @@ class ProfileController extends Controller
|
||||
$settings = $request->user()->settings;
|
||||
$settings['timezone'] = $request->get('timezone');
|
||||
$request->user()->settings = $settings;
|
||||
$request->user()->save();
|
||||
|
||||
$request->user()->save();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user