diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 34dc4722..da4337ee 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -56,9 +56,11 @@ class ReportController extends Controller public function track() { - return Report::where('reporter', auth()->id()) + $reports = Report::where('reporter', auth()->id()) ->orderBy('report_at', 'desc') ->get(); + + return view('user.report', ['reports' => $reports]); } public function manage(Request $request) diff --git a/resources/assets/src/scripts/route.ts b/resources/assets/src/scripts/route.ts index f2dfad30..5d253166 100644 --- a/resources/assets/src/scripts/route.ts +++ b/resources/assets/src/scripts/route.ts @@ -28,11 +28,6 @@ export default [ component: () => import('../views/user/Bind.vue'), el: 'form', }, - { - path: 'user/reports', - component: () => import('../views/user/Report.vue'), - el: '.content > .container-fluid', - }, { path: 'user/profile', module: [ diff --git a/resources/views/user/report.twig b/resources/views/user/report.twig index c6906d63..16c46736 100644 --- a/resources/views/user/report.twig +++ b/resources/views/user/report.twig @@ -1,3 +1,35 @@ {% extends 'user.base' %} {% block title %}{{ trans('general.my-reports') }}{% endblock %} + +{% block content %} +
+
+ + + + + + + + + + + {% for report in reports %} + + + + + + + {% endfor %} + +
{{ trans('front-end.report.tid') }}{{ trans('front-end.report.reason') }}{{ trans('front-end.report.status-title') }}{{ trans('front-end.report.time') }}
+ {{ report.tid }}  + + + + {{ report.reason }}{{ trans('front-end.report.status')[report.status] }}{{ report.report_at }}
+
+
+{% endblock %} diff --git a/routes/web.php b/routes/web.php index b2cb3562..853ca1b1 100644 --- a/routes/web.php +++ b/routes/web.php @@ -57,10 +57,7 @@ Route::prefix('user') Route::get('score-info', 'UserController@scoreInfo')->name('score'); Route::post('sign', 'UserController@sign')->name('sign'); - Route::prefix('reports')->group(function () { - Route::view('', 'user.report'); - Route::get('list', 'ReportController@track'); - }); + Route::get('reports', 'ReportController@track'); Route::prefix('profile')->group(function () { Route::get('', 'UserController@profile')->name('profile'); diff --git a/tests/HttpTest/ControllersTest/ReportControllerTest.php b/tests/HttpTest/ControllersTest/ReportControllerTest.php index 84f87d00..7e3671b5 100644 --- a/tests/HttpTest/ControllersTest/ReportControllerTest.php +++ b/tests/HttpTest/ControllersTest/ReportControllerTest.php @@ -113,12 +113,9 @@ class ReportControllerTest extends TestCase $report->save(); $this->actingAs($user) - ->getJson('/user/reports/list') - ->assertJson([[ - 'tid' => 1, - 'reason' => 'test', - 'status' => Report::PENDING, - ]]); + ->getJson('/user/reports') + ->assertSee('test') + ->assertSee(trans('front-end.report.status')[0]); } public function testManage()