fixed title for page show Chapter, Exercise, Solution v.3

Hexlet · Apr 2, 2024 · 903af7d · 903af7d
1 parent 81d44a8
commit 903af7d
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 41 deletions.
diff --git a/app/Helpers/TemplateHelper.php b/app/Helpers/TemplateHelper.php
@@ -4,12 +4,10 @@
 
 class TemplateHelper
 {
-    public static function getTitleContent(object $model): string
+    public static function getTitleContent(string $header, string $title): string
     {
-        $header = $model->getFullTitle();
-        $nameModel = $model->getNameModel();
         $nameProject = __('layout.title.name_SICP');
-        return "{$nameModel} {$header} - {$nameProject}";
+        return "{$title} {$header} - {$nameProject}";
     }
 
     public static function getBookLink(string $locale): string

diff --git a/app/Helpers/helpers.php b/app/Helpers/helpers.php
@@ -9,9 +9,9 @@
 use Illuminate\Support\Collection;
 
 if (!function_exists('getTitleContent')) {
-    function getTitleContent(object $model): string
+    function getTitleContent(string $header, string $title = ''): string
     {
-        return TemplateHelper::getTitleContent($model);
+        return TemplateHelper::getTitleContent($header, $title);
     }
 }
 

diff --git a/app/Models/Chapter.php b/app/Models/Chapter.php
@@ -60,9 +60,4 @@ public function getFullTitle(): string
     {
         return $this->present()->fullTitle;
     }
-
-    public function getNameModel(): string
-    {
-        return $this->present()->nameModel;
-    }
 }
diff --git a/app/Models/Exercise.php b/app/Models/Exercise.php
@@ -118,9 +118,4 @@ public function getExerciseTeacherSolution(): string
 
         return trim($fileContent);
     }
-
-    public function getNameModel(): string
-    {
-        return $this->present()->nameModel;
-    }
 }
diff --git a/app/Models/Solution.php b/app/Models/Solution.php
@@ -40,14 +40,4 @@ public function scopeVersioned(Builder $builder): Builder
                     ->from(self::getTable());
             }, $this->getTable());
     }
-
-    public function getFullTitle(): string
-    {
-        return $this->exercise->getFullTitle();
-    }
-
-    public function getNameModel(): string
-    {
-        return __('solution.solution_for_title');
-    }
 }
diff --git a/app/Presenters/ChapterPresenter.php b/app/Presenters/ChapterPresenter.php
@@ -8,15 +8,9 @@
 /**
  * @mixin Chapter
  * @property-read string $fullTitle
- * @property-read string $nameModel
  */
 class ChapterPresenter extends Presenter
 {
-    public function getNameModelAttribute(): string
-    {
-        return __('chapter.chapter');
-    }
-
     public function getFullTitleAttribute(): string
     {
         $path = $this->path;

diff --git a/app/Presenters/ExercisePresenter.php b/app/Presenters/ExercisePresenter.php
@@ -10,7 +10,6 @@
  * @property-read string $underscorePath
  * @property-read string $title
  * @property-read string $fullTitle
- * @property-read string $nameModel
  */
 class ExercisePresenter extends Presenter
 {
@@ -35,9 +34,4 @@ public function getFullTitleAttribute(): string
 
         return "$path $exerciseTitle";
     }
-
-    public function getNameModelAttribute(): string
-    {
-        return __('exercise.exercise');
-    }
 }
diff --git a/resources/views/chapter/show.blade.php b/resources/views/chapter/show.blade.php
@@ -10,7 +10,7 @@
    */
 @endphp
 @section('title')
-  {{ getTitleContent($chapter) }}
+  {{ getTitleContent($chapter->getFullTitle(), __('chapter.chapter')) }}
 @endsection
 @section('description')
   @foreach (Breadcrumbs::generate('chapter', $chapter) as $breadcrumb)

diff --git a/resources/views/exercise/show.blade.php b/resources/views/exercise/show.blade.php
@@ -7,7 +7,7 @@
    */
 @endphp
 @section('title')
-  {{ getTitleContent($exercise) }}
+  {{ getTitleContent($exercise->getFullTitle(), __('exercise.exercise')) }}
 @endsection
 @section('description')
   {{ __('exercise.exercise') }} {{ $exercise->path }} {{ $exercise->getTitle() }} {{ __('exercise.show.description') }}

diff --git a/resources/views/solution/show.blade.php b/resources/views/solution/show.blade.php
@@ -2,7 +2,7 @@
 
 @section('meta-robots', 'nofollow, noindex')
 @section('title')
-  {{ getTitleContent($solution) }}
+  {{ getTitleContent($currentExercise->getFullTitle(), __('solution.solution_for_title')) }}
 @endsection
 @section('description'){{ $user->id }} - {{ __('solution.code_review') }} - {{ $user->name }} -
   {{ __('solution.exercise') }} {{ $currentExercise->getFullTitle() }}@endsection