#78 - proper page titles and favicon (#122)

.env.example

@@ -9,6 +9,7 @@ DB_DATABASE=keating
 DB_USERNAME=keating
 DB_PASSWORD=password
 
+CACHE_DRIVER=redis
 QUEUE_CONNECTION=redis
 SESSION_DRIVER=redis
 

.github/workflows/test-and-lint-php.yml

@@ -54,7 +54,7 @@ jobs:
           coverage: none
 
       - name: Install Composer dependencies
-        run: composer install --prefer-dist --no-interaction --no-suggest
+        run: composer install --prefer-dist --no-interaction
 
       - name: Run PHP linter
         run: composer cs

app/Console/Commands/FlushCachedPageTitle.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Console\Commands;
+
+use Illuminate\Cache\CacheManager;
+use Illuminate\Console\Command;
+
+class FlushCachedPageTitle extends Command
+{
+    protected $signature = "cache:title:flush";
+    protected $description = "Flush cached page title";
+
+    public function handle(CacheManager $cache): void
+    {
+        $cache->forget("pageTitle");
+    }
+}

app/Http/Controllers/Public/HomeController.php

@@ -25,7 +25,7 @@ public function __invoke(): Response
             "email" => $settings->teacher_email,
             "department" => $settings->department_name,
             "university" => $settings->university_name,
-            "universityLogo" => "https://irg2023.collegiumwitelona.pl/assets/logos/cwup.png",
+            "universityLogo" => asset("cwup-full.png"),
             "sectionSettings" => $sectionSettings,
             "about" => $sectionSettings->about_enabled ? Section::query()->about()->orderBy("created_at")->get() : [],
             "counters" => $sectionSettings->counters_enabled ? Section::query()->counter()->orderBy("created_at")->get() : [],

app/Http/Controllers/Public/LoginController.php

@@ -15,7 +15,7 @@ class LoginController extends Controller
     public function create(): Response
     {
         return inertia("Public/Login", [
-            "universityLogo" => "https://irg2023.collegiumwitelona.pl/assets/logos/cwup.png",
+            "universityLogo" => asset("cwup-full.png"),
         ]);
     }
 

app/Providers/ViewServiceProvider.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Providers;
+
+use App\Models\Setting;
+use Illuminate\Cache\CacheManager;
+use Illuminate\Database\QueryException;
+use Illuminate\Support\ServiceProvider;
+use Illuminate\View\Factory;
+
+class ViewServiceProvider extends ServiceProvider
+{
+    public function boot(CacheManager $cache, Factory $view): void
+    {
+        $title = $cache->get("pageTitle", function () use ($cache): string {
+            try {
+                $settings = Setting::query()->first();
+            } catch (QueryException) {
+                $settings = null;
+            }
+
+            $title = $settings
+                ? "{$settings->teacher_titles} {$settings->teacher_name}, {$settings->university_name}"
+                : config("app.name");
+
+            $cache->put("pageTitle", $title);
+
+            return $title;
+        });
+
+        $view->share("pageTitle", $title);
+    }
+}

bootstrap/providers.php

@@ -3,7 +3,9 @@
 declare(strict_types=1);
 
 use App\Providers\BuilderServiceProvider;
+use App\Providers\ViewServiceProvider;
 
 return [
     BuilderServiceProvider::class,
+    ViewServiceProvider::class,
 ];

composer.json

@@ -44,12 +44,6 @@
         "post-update-cmd": [
             "@php artisan vendor:publish --tag=laravel-assets --ansi --force"
         ],
-        "post-root-package-install": [
-            "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
-        ],
-        "post-create-project-cmd": [
-            "@php artisan key:generate --ansi"
-        ],
         "test": [
             "@putenv XDEBUG_MODE=off",
             "@php artisan test"

config/cache.php

@@ -5,7 +5,7 @@
 use Illuminate\Support\Str;
 
 return [
-    "default" => env("CACHE_DRIVER", "redis"),
+    "default" => env("CACHE_DRIVER", "array"),
     "stores" => [
         "apc" => [
             "driver" => "apc",

environment/prod/deployment/scripts/post-deploy-actions.sh

@@ -9,4 +9,5 @@ php ${ARTISAN_PATH} migrate --force && \
 php ${ARTISAN_PATH} route:cache && \
 php ${ARTISAN_PATH} view:cache && \
 php ${ARTISAN_PATH} event:cache && \
-php ${ARTISAN_PATH} config:cache
+php ${ARTISAN_PATH} config:cache && \
+php ${ARTISAN_PATH} cache:title:flush

resources/js/Layouts/DashboardLayout.vue

@@ -19,6 +19,7 @@ import {
 } from '@heroicons/vue/24/outline'
 import { ref, watch } from 'vue'
 import { useToast } from 'vue-toastification'
+import { Head } from '@inertiajs/inertia-vue3'
 
 const toast = useToast()
 const props = defineProps({
@@ -77,6 +78,8 @@ watch(() => props.flash, (flash) => {
 </script>
 
 <template>
+  <Head title="Panel administracyjny" />
+
   <div>
     <TransitionRoot as="template" :show="sidebarOpen">
       <Dialog as="div" class="relative z-50 lg:hidden" @close="sidebarOpen = false">

resources/js/Pages/Public/Grade.vue

@@ -2,7 +2,7 @@
 import PublicLayout from '@/Layouts/PublicLayout.vue'
 import BackgroundGrid from '@/Components/BackgroundGrid.vue'
 import SectionHeader from '@/Components/SectionHeader.vue'
-import { Link } from '@inertiajs/inertia-vue3'
+import { Head, Link } from '@inertiajs/inertia-vue3'
 import SubmitButton from '@/Shared/Components/Buttons/SubmitButton.vue'
 import TableWrapper from '@/Shared/Components/Table/TableWrapper.vue'
 import TableHeader from '@/Shared/Components/Table/TableHeader.vue'
@@ -36,6 +36,8 @@ function getIndex() {
 </script>
 
 <template>
+  <Head title="Oceny" />
+
   <PublicLayout>
     <div class="relative isolate bg-gradient-to-r from-gray-50 to-gray-100 py-24 sm:py-32">
       <BackgroundGrid mask-direction="left" />

resources/js/Pages/Public/Home.vue

@@ -6,6 +6,7 @@ import {
 import BackgroundGrid from '@/Components/BackgroundGrid.vue'
 import SectionHeader from '@/Components/SectionHeader.vue'
 import DOMPurify from 'dompurify'
+import { Head } from '@inertiajs/inertia-vue3'
 
 defineProps({
   title: String,
@@ -21,6 +22,8 @@ defineProps({
 </script>
 
 <template>
+  <Head title="/" />
+
   <PublicLayout>
     <div v-if="sectionSettings.banner_enabled" class="relative isolate bg-white pt-14">
       <BackgroundGrid />

resources/js/Pages/Public/Login.vue

@@ -1,7 +1,7 @@
 <script setup>
 import PublicLayout from '@/Layouts/PublicLayout.vue'
 import BackgroundGrid from '@/Components/BackgroundGrid.vue'
-import { useForm } from '@inertiajs/inertia-vue3'
+import { Head, useForm } from '@inertiajs/inertia-vue3'
 
 defineProps({
   university: String,
@@ -19,6 +19,8 @@ function attemptLogin() {
 </script>
 
 <template>
+  <Head title="Logowanie" />
+
   <PublicLayout>
     <div class="relative isolate bg-white pt-14">
       <BackgroundGrid />

resources/js/Pages/Public/News/Index.vue

@@ -5,6 +5,7 @@ import SectionHeader from '../../../Components/SectionHeader.vue'
 import Pagination from '../../../Components/Pagination.vue'
 import sanitizeHtml from 'sanitize-html'
 import { NoSymbolIcon } from '@heroicons/vue/24/outline'
+import { Head } from '@inertiajs/inertia-vue3'
 
 defineProps({
   paginator: Object,
@@ -13,6 +14,8 @@ defineProps({
 </script>
 
 <template>
+  <Head title="Aktualności" />
+
   <PublicLayout>
     <div class="relative isolate bg-white">
       <BackgroundGrid />

resources/js/Pages/Public/News/News.vue

@@ -3,13 +3,16 @@ import PublicLayout from '@/Layouts/PublicLayout.vue'
 import BackgroundGrid from '../../../Components/BackgroundGrid.vue'
 import SectionHeader from '../../../Components/SectionHeader.vue'
 import sanitizeHtml from 'sanitize-html'
+import { Head } from '@inertiajs/inertia-vue3'
 
 defineProps({
   news: Object,
 })
 </script>
 
 <template>
+  <Head :title="news.title + ' - Aktualności'" />
+
   <PublicLayout>
     <div class="relative isolate bg-white">
       <BackgroundGrid />

resources/js/app.js

@@ -4,12 +4,16 @@ import { autoAnimatePlugin } from '@formkit/auto-animate/vue'
 import Toast from 'vue-toastification'
 import '../css/app.css'
 
+const pageTitle = document.getElementsByName('title')[0].content ?? 'Keating'
+
 createInertiaApp({
   progress: {
     delay: 50,
     color: '#14b8a6',
   },
-  title: (title) => title ? `${title} - Keating` : 'Keating',
+  title: function(title) {
+    return title && title !== '/' ? `${title} - ${pageTitle}` : pageTitle
+  },
   resolve: name => {
     const pages = import.meta.glob('./Pages/**/*.vue', { eager: true })
 

resources/views/app.blade.php

@@ -1,9 +1,10 @@
 <!DOCTYPE html>
-<html class="h-full bg-gray-100" lang="en">
+<html class="h-full bg-gray-100" lang="pl">
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
-        <title></title>
+        <link rel="icon" type="image/x-icon" href="{{ asset("cwup-icon.png") }}">
+        <meta name="title" content="{{ $pageTitle }}">
         @vite("resources/js/app.js")
         @inertiaHead
     </head>

tests/Feature/CourseSemesterTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Feature;
+namespace Tests\Feature;
 
 use App\Models\Course;
 use App\Models\CourseSemester;

tests/Feature/CourseTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Feature;
+namespace Tests\Feature;
 
 use App\Models\Course;
 use App\Models\User;

tests/Feature/FieldTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Feature;
+namespace Tests\Feature;
 
 use App\Models\Field;
 use App\Models\User;

tests/Feature/GradeColumnTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Feature;
+namespace Tests\Feature;
 
 use App\Models\GradeColumn;
 use App\Models\Group;

tests/Feature/GradeTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Feature;
+namespace Tests\Feature;
 
 use App\Models\Grade;
 use App\Models\GradeColumn;

tests/Feature/GroupTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Feature;
+namespace Tests\Feature;
 
 use App\Models\CourseSemester;
 use App\Models\Group;

tests/Feature/SectionsTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Feature;
+namespace Tests\Feature;
 
 use App\Models\Section;
 use App\Models\SectionSettings;