From efd15c220459ba9a062f599baf6602159c7b9c5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20St=C3=B6ckel?= Date: Sat, 11 Jan 2025 13:13:37 +0100 Subject: [PATCH] :fire: remove global dashboard --- .github/workflows/phpunit.yml | 2 +- .../Controllers/API/v1/StatusController.php | 34 +--------- .../Controllers/FrontendStatusController.php | 9 --- lang/de.json | 5 +- lang/en.json | 3 +- lang/es.json | 3 +- lang/fr.json | 3 +- lang/nl.json | 3 +- resources/views/dashboard.blade.php | 8 +-- resources/views/layouts/app.blade.php | 5 -- routes/web.php | 3 - storage/api-docs/api-docs.json | 63 ------------------- tests/Feature/Frontend/LanguageTest.php | 2 +- tests/Feature/UserBlockTest.php | 34 ---------- tests/Feature/UserRedirectionTest.php | 2 +- 15 files changed, 14 insertions(+), 165 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 7228966d5..409d517f7 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -59,4 +59,4 @@ jobs: env: DB_CONNECTION: sqlite DB_DATABASE: database/database.sqlite - run: php artisan test --parallel --coverage --min=45 #Increase this value regularly while writing tests. Target: 80% + run: php artisan test --parallel --coverage --min=40 #Increase this value regularly while writing tests. Target: 80% diff --git a/app/Http/Controllers/API/v1/StatusController.php b/app/Http/Controllers/API/v1/StatusController.php index de2a1d567..340904258 100644 --- a/app/Http/Controllers/API/v1/StatusController.php +++ b/app/Http/Controllers/API/v1/StatusController.php @@ -72,39 +72,7 @@ public static function getDashboard(): AnonymousResourceCollection { } /** - * @OA\Get( - * path="/dashboard/global", - * operationId="getGlobalDashboard", - * tags={"Dashboard"}, - * summary="Get paginated statuses of global dashboard", - * description="Returns paginated statuses of global dashboard", - * @OA\Parameter ( - * name="page", - * description="Page of pagination", - * required=false, - * in="query", - * @OA\Schema(type="integer") - * ), - * @OA\Response( - * response=200, - * description="successful operation", - * @OA\JsonContent( - * @OA\Property(property="data", type="array", - * @OA\Items( - * ref="#/components/schemas/StatusResource" - * ) - * ), - * @OA\Property(property="links", ref="#/components/schemas/Links"), - * @OA\Property(property="meta", ref="#/components/schemas/PaginationMeta"), - * ) - * ), - * @OA\Response(response=400, description="Bad request"), - * @OA\Response(response=401, description="Not logged in"), - * security={ - * {"passport": {"read-statuses"}}, {"token": {}} - * } - * ) - * + * @deprecated */ public static function getGlobalDashboard(): AnonymousResourceCollection { return StatusResource::collection(DashboardController::getGlobalDashboard(Auth::user())); diff --git a/app/Http/Controllers/FrontendStatusController.php b/app/Http/Controllers/FrontendStatusController.php index 4d7680b34..56a9f1f7f 100644 --- a/app/Http/Controllers/FrontendStatusController.php +++ b/app/Http/Controllers/FrontendStatusController.php @@ -30,15 +30,6 @@ public function getDashboard(): Renderable|RedirectResponse { ]); } - public function getGlobalDashboard(): Renderable { - return view('dashboard', [ - 'statuses' => DashboardController::getGlobalDashboard(Auth::user()), - 'latest' => StationController::getLatestArrivals(Auth::user()), - 'future' => StatusBackend::getFutureCheckins(), - 'showGlobalButton' => false - ]); - } - public function getActiveStatuses(): View { return view('activejourneys', [ 'currentUser' => Auth::user(), diff --git a/lang/de.json b/lang/de.json index 73bff6879..e53786b02 100644 --- a/lang/de.json +++ b/lang/de.json @@ -517,11 +517,10 @@ "user.already-unmuted": "Der Benutzer :username ist nicht stummgeschaltet.", "user.unmute-tooltip": "Benutzer nicht mehr stummschalten", "dashboard.future": "Deine Check-ins in der Zukunft", - "dashboard.empty": "Dein dashboard wirkt noch etwas leer.", + "dashboard.empty": "Dein Dashboard wirkt noch etwas leer.", "dashboard.empty.teaser": "Wenn du möchtest, kannst du anderen Träwellern folgen, um ihre Check-ins zu sehen!", "dashboard.empty.discover1": "Neue Leute kannst du unter", - "dashboard.empty.discover2": "oder", - "dashboard.empty.discover3": "(achtung, lange Wartezeit) entdecken", + "dashboard.empty.discover3": "entdecken", "description.profile": ":username ist bereits :kmAmount Kilometer in :hourAmount Stunden in öffentlichen Verkehrsmitteln unterwegs gewesen.", "description.status": "Die Reise von :username von :origin nach :destination am :date in :lineName.", "description.leaderboard.main": "Die Top Träweller der letzten 7 Tage.", diff --git a/lang/en.json b/lang/en.json index 5b2a23ac7..fd75f761c 100644 --- a/lang/en.json +++ b/lang/en.json @@ -476,8 +476,7 @@ "dashboard.empty": "Your dashboard seems a bit empty.", "dashboard.empty.teaser": "If you want to, you can follow some people to see their check-ins here.", "dashboard.empty.discover1": "You can discover new people in the section", - "dashboard.empty.discover2": "or", - "dashboard.empty.discover3": "(careful, slow load times)", + "dashboard.empty.discover3": "", "user.block-tooltip": "Block user", "user.blocked": "You have blocked the user :username.", "user.already-blocked": "The user :username is already blocked.", diff --git a/lang/es.json b/lang/es.json index 34d26b67e..02ad24324 100644 --- a/lang/es.json +++ b/lang/es.json @@ -576,8 +576,7 @@ "messages.exception.general-values": "Ha ocurrido un error desconocido. Vuelve a probar con otros valores.", "messages.exception.reference": "Referencia del error: :reference", "generic.error": "Error", - "dashboard.empty.discover2": "o", - "dashboard.empty.discover3": "(cuidado, tiempos largos de carga)", + "dashboard.empty.discover3": "", "user.unmute-tooltip": "Quitar silencio al usuario", "dashboard.empty": "Tu escritorio parece vacío.", "dashboard.empty.teaser": "Si quieres, puedes seguir a otras personas para ver sus check-ins aqui.", diff --git a/lang/fr.json b/lang/fr.json index 99809e0c0..8687e0c3d 100644 --- a/lang/fr.json +++ b/lang/fr.json @@ -757,7 +757,7 @@ "user.login.mastodon": "S'identifier avec Mastodon", "user.login.or": "ou", "user.no-account": "Vous n'avez pas encore de compte ?", - "dashboard.empty.discover3": "(attention, temps de chargement lents)", + "dashboard.empty.discover3": "", "checkin.success.body": "Vous avez réussi avec succés votre enregistrement !", "checkin.success.body2": "Vous allez faire :distance km dans la ligne :lineName de :origin à :destination.", "settings.friend_checkin.friends": "Amis", @@ -797,7 +797,6 @@ "welcome.stats.million": "Million", "welcome.stats.distance": "kilomètres parcourus", "welcome.hero.stats.description": "Vous pouvez recueillir des statistiques sur les opérateurs de transport les plus utilisés, les modes de transport et bien plus encore !", - "dashboard.empty.discover2": "ou", "notifications.eventSuggestionProcessed.missing-information": "Nous ne pouvons pas approuver cet événement en raison d'informations manquantes. Veuillez nous fournir une source ou un site web spécifique sur cet événement.", "notifications.youHaveBeenCheckedIn.lead": "Vous avez été enregistré par @:username", "welcome.header.open-source": "Open source & gratuit, aujourd'hui et pour toujours.", diff --git a/lang/nl.json b/lang/nl.json index 312ef606f..60af0232a 100644 --- a/lang/nl.json +++ b/lang/nl.json @@ -774,8 +774,7 @@ "dashboard.empty": "Je overzicht lijkt erg leeg.", "dashboard.empty.teaser": "Als je wilt, kun je mensen volgen en hier zien waar ze zijn ingecheckt.", "dashboard.empty.discover1": "Zoek personen om te volgen in de sectie", - "dashboard.empty.discover2": "of", - "dashboard.empty.discover3": "(let op: lange laadtijden)", + "dashboard.empty.discover3": "", "trip_creation.limitations.6.rules": "Regels", "trip_creation.limitations.6.link": "https://help.traewelling.de/en/features/manual-trips/#info", "user.points-enabled": "Punten en klassement tonen", diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index b3a5c6313..665c9137a 100644 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -161,10 +161,10 @@ class="accordion-collapse collapse"

{{ __('dashboard.empty.teaser') }}

{{ __('dashboard.empty.discover1') }} - {{ __('menu.active') }} - {{ __('dashboard.empty.discover2') }} - {{ __('menu.globaldashboard') }} - {{ __('dashboard.empty.discover3') }} + + {{ __('menu.active') }} + + {{ __('dashboard.empty.discover3') }}.

@endif diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 578f7c0d9..4079fe3ed 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -195,11 +195,6 @@ class="border border-white rounded-left form-control my-0 py-1"