seatplus · herpaderpaldent · Oct 30, 2023 · Oct 15, 2023 · Oct 15, 2023 · Oct 15, 2023
diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml
@@ -2,9 +2,9 @@ name: Laravel
 
 on:
   push:
-    branches: [ 2.x, 3.x ]
+    branches: [ 4.x ]
   pull_request:
-    branches: [ 2.x, 3.x ]
+    branches: [ 4.x ]
 
 jobs:
   laravel:
@@ -21,7 +21,7 @@ jobs:
         coverage: xdebug #optional
     - uses: getong/mariadb-action@v1.1
       with:
-        host port: 3308 # Optional, default value is 3306. The port of host
+        #host port: 3308 # Optional, default value is 3306. The port of host
         mariadb version: '10.7' # Optional, default value is "latest". The version of the MariaDB
         mysql database: 'testbench' # Optional, default value is "test". The specified database which will be create
         mysql user: 'default' # Required if "mysql root password" is empty, default is empty. The superuser for the specified database. Can use secrets, too

diff --git a/config/web.images.php b/config/web.images.php
@@ -0,0 +1,6 @@
+<?php
+
+return [
+    'logo' => env('LOGO_PATH', 'img/seat_plus.svg'),
+    'icon' => env('ICON_PATH', 'img/seat_plus_logo.svg'),
+];
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,32 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
-  <coverage>
-    <report>
-      <clover outputFile="build/logs/clover.xml"/>
-    </report>
-  </coverage>
-  <testsuites>
-    <testsuite name="Package Test Suite">
-      <directory suffix="Test.php">./tests/</directory>
-    </testsuite>
-  </testsuites>
-  <php>
-    <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
-    <env name="APP_ENV" value="testing"/>
-    <env name="REDIS_HOST" value="redis"/>
-    <env name="REDIS_PASSWORD" value="null"/>
-    <env name="REDIS_PORT" value="6379"/>
-    <env name="DB_CONNECTION" value="mysql"/>
-    <env name="DB_HOST" value="127.0.0.1"/>
-    <env name="DB_PORT" value="3308"/>
-    <env name="DB_DATABASE" value="testbench"/>
-    <env name="DB_USERNAME" value="default"/>
-    <env name="DB_PASSWORD" value="secret"/>
-  </php>
-  <logging/>
-  <source>
-    <include>
-      <directory suffix=".php">./src/</directory>
-    </include>
-  </source>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" executionOrder="random" failOnWarning="true" failOnRisky="true" failOnEmptyTestSuite="true" beStrictAboutOutputDuringTests="true" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+    <testsuites>
+        <testsuite name="Seatplus Test Suite">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+    <php>
+        <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
+        <env name="REDIS_CLIENT" value="phpredis"/>
+        <env name="REDIS_HOST" value="127.0.0.1"/>
+        <env name="REDIS_PASSWORD" value="null"/>
+        <env name="REDIS_PORT" value="6379"/>
+        <env name="DB_CONNECTION" value="mysql" />
+        <env name="DB_HOST" value="127.0.0.1"/>
+        <env name="DB_PORT" value="3306"/>
+        <env name="DB_DATABASE" value="testbench"/>
+        <env name="DB_USERNAME" value="default"/>
+        <env name="DB_PASSWORD" value="secret"/>
+    </php>
+    <coverage>
+        <report>
+            <html outputDirectory="build/coverage"/>
+            <text outputFile="build/coverage.txt"/>
+            <clover outputFile="build/logs/clover.xml"/>
+        </report>
+    </coverage>
+    <logging>
+        <junit outputFile="build/report.junit.xml"/>
+    </logging>
+    <source>
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+    </source>
 </phpunit>
diff --git a/resources/js/Pages/AccessControl/ControlGroupsIndex.vue b/resources/js/Pages/AccessControl/ControlGroupsIndex.vue
@@ -1,10 +1,6 @@
 <template>
   <div class="space-y-3">
-    <teleport to="#head">
-      <title>{{ title(pageTitle) }}</title>
-    </teleport>
-    <PageHeader>
-      {{ pageTitle }}
+    <PageHeader :page-title="pageTitle">
       <template #primary>
         <CreateGroupButton />
       </template>
@@ -41,7 +37,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-
-</style>
diff --git a/resources/js/Pages/AccessControl/ManageControlGroup.vue b/resources/js/Pages/AccessControl/ManageControlGroup.vue
@@ -1,10 +1,6 @@
 <template>
   <div class="space-y-3">
-    <teleport to="#head">
-      <title>{{ title(pageTitle) }}</title>
-    </teleport>
-    <PageHeader :breadcrumbs="breadcrumbs">
-      {{ pageTitle }}
+    <PageHeader :page-title="pageTitle" :breadcrumbs="breadcrumbs">
       <template #primary>
         <HeaderButton @click="store">
           Save
@@ -246,7 +242,7 @@ export default {
     },
     data() {
         return {
-            pageTitle: `Manage ${this.role.name}`,
+            pageTitle: `Manage ${this.role.title}`,
             breadcrumbs: [
                 {
                     name: 'Control Group',

diff --git a/resources/js/Pages/AccessControl/ModerateMembers.vue b/resources/js/Pages/AccessControl/ModerateMembers.vue
@@ -1,11 +1,6 @@
 <template>
   <div class="space-y-4">
-    <teleport to="#head">
-      <title>{{ title(pageTitle) }}</title>
-    </teleport>
-    <PageHeader :breadcrumbs="breadcrumbs">
-      {{ pageTitle }}
-    </PageHeader>
+    <PageHeader :page-title="pageTitle" :breadcrumbs="breadcrumbs" />
     <div class="bg-white overflow-hidden shadow rounded-lg">
       <!--Header-->
       <div class="border-b border-gray-200 px-4 py-5 sm:px-6">

diff --git a/resources/js/Pages/Auth/Login.vue b/resources/js/Pages/Auth/Login.vue
@@ -1,8 +1,6 @@
 <template>
   <div>
-    <teleport to="#head">
-      <title>{{ title('Login') }}</title>
-    </teleport>
+    <AppHead app-title="Login" />
     <div class="sm:mx-auto sm:w-full sm:max-w-md">
       <div>
         <img
@@ -41,35 +39,16 @@
       </div>
     </div>
   </div>
-  <!--<div class="login-page" style="min-height: 512.8px;">
-    <div class="login-box">
-      <flash-messages/>
-      <div class="login-logo">
-        <b>SeAT</b>plus
-      </div>
-      &lt;!&ndash; /.login-logo &ndash;&gt;
-      <div class="card">
-
-        <div class="card-body login-card-body">
-          {{ $page.login_welcome }}
-          <div class="social-auth-links text-center mb-3">
-            <a :href="route('auth.eve')">
-                <b-img :src="$page.evesso_img_src" fluid />
-            </a>
-          </div>
-        </div>
-        &lt;!&ndash; /.login-card-body &ndash;&gt;
-      </div>
-    </div>
-  </div>-->
 </template>
 
 <script>
 
 import EmptyLayout from "@/Shared/Layout/AuthLayout/EmptyLayout.vue";
+import AppHead from "@/Shared/AppHead.vue";
 
 export default {
     name: "Login",
+    components: {AppHead},
     layout: (h, page) => h(EmptyLayout, [page]),
 
 }

diff --git a/resources/js/Pages/Auth/MissingRequiredScopes.vue b/resources/js/Pages/Auth/MissingRequiredScopes.vue
@@ -1,8 +1,6 @@
 <template>
   <div>
-    <teleport to="#head">
-      <title>{{ title('Missing Characters Esi Scopes') }}</title>
-    </teleport>
+    <AppHead app-title="Missing Characters Esi Scopes" />
     <div class="sm:mx-auto sm:w-full sm:max-w-md">
       <h2 class="mt-6 text-center text-3xl leading-9 font-extrabold text-gray-900">
         {{ $I18n.trans('web::missing_required_scopes.title') }}
@@ -86,9 +84,10 @@
     import EveImage from "@/Shared/EveImage.vue"
     import ImpersonatingBanner from "@/Shared/SidebarLayout/ImpersonatingBanner.vue";
     import EmptyLayout from "@/Shared/Layout/AuthLayout/EmptyLayout.vue";
+    import AppHead from "@/Shared/AppHead.vue";
     export default {
         name: "MissingRequiredScopes",
-        components: {ImpersonatingBanner, EveImage},
+        components: {AppHead, ImpersonatingBanner, EveImage},
         layout: (h, page) => h(EmptyLayout, [page]),
         props: {
             characters: {

diff --git a/resources/js/Pages/Character/Assets.vue b/resources/js/Pages/Character/Assets.vue
@@ -1,13 +1,8 @@
 <template>
   <div class="space-y-3">
-    <teleport to="#head">
-      <title>{{ title(pageTitle) }}</title>
-    </teleport>
-
     <RequiredScopesWarning :dispatch-transfer-object="dispatchTransferObject" />
 
-    <PageHeader>
-      {{ pageTitle }}
+    <PageHeader :page-title="pageTitle">
       <template #primary>
         <DispatchUpdateButton />
       </template>

diff --git a/resources/js/Pages/Character/Contact/Index.vue b/resources/js/Pages/Character/Contact/Index.vue
@@ -1,13 +1,8 @@
 <template>
   <div class="space-y-3">
-    <teleport to="#head">
-      <title>{{ title(pageTitle) }}</title>
-    </teleport>
-
     <RequiredScopesWarning :dispatch-transfer-object="dispatchTransferObject" />
 
-    <PageHeader>
-      {{ pageTitle }}
+    <PageHeader :page-title="pageTitle">
       <template #primary>
         <DispatchUpdateButton />
       </template>

diff --git a/resources/js/Pages/Character/Contract/ContractDetails.vue b/resources/js/Pages/Character/Contract/ContractDetails.vue
@@ -1,12 +1,6 @@
 <template>
   <div class="space-y-3">
-    <teleport to="#head">
-      <title>{{ title(pageTitle) }}</title>
-    </teleport>
-
-    <PageHeader :breadcrumbs="breadcrumbs">
-      Contract Details
-    </PageHeader>
+    <PageHeader :page-title="pageTitle" :breadcrumbs="breadcrumbs" />
 
     <ContractDetailsComponent
       v-if="contract.items.length > 0"

diff --git a/resources/js/Pages/Character/Contract/Index.vue b/resources/js/Pages/Character/Contract/Index.vue
@@ -1,13 +1,8 @@
 <template>
   <div class="space-y-3">
-    <teleport to="#head">
-      <title>{{ title(pageTitle) }}</title>
-    </teleport>
-
     <RequiredScopesWarning :dispatch-transfer-object="dispatchTransferObject" />
 
-    <PageHeader>
-      {{ pageTitle }}
+    <PageHeader :page-title="pageTitle">
       <template #primary>
         <DispatchUpdateButton />
       </template>

diff --git a/resources/js/Pages/Character/ItemDetails.vue b/resources/js/Pages/Character/ItemDetails.vue
@@ -1,8 +1,6 @@
 <template>
   <div>
-    <teleport to="#head">
-      <title>{{ title(object.name) }}</title>
-    </teleport>
+    <AppHead :app-title="object.name" />
     <PageHeader :breadcrumbs="breadcrumbs">
       <div class="flex items-center">
         <div class="shrink-0">
@@ -29,10 +27,11 @@ import EveImage from "@/Shared/EveImage.vue"
 import PageHeader from "@/Shared/Layout/PageHeader.vue";
 import ItemLayout from "@/Shared/Components/ItemLayout.vue";
 import { prefix } from "metric-prefix";
+import AppHead from "@/Shared/AppHead.vue";
 
 export default {
     name: "ItemDetails",
-    components : {ItemLayout, PageHeader, EveImage},
+    components : {AppHead, ItemLayout, PageHeader, EveImage},
     props: {
         item: {
             type    : Object,

diff --git a/resources/js/Pages/Character/Mail/Index.vue b/resources/js/Pages/Character/Mail/Index.vue
@@ -1,15 +1,11 @@
 <template>
   <MultiColumnLayout>
-    <teleport to="#head">
-      <title>{{ title(pageTitle) }}</title>
-    </teleport>
     <div class="absolute inset-0 py-6 px-4 sm:px-6 lg:px-8">
       <div class="space-y-3">
         <RequiredScopesWarning :dispatch-transfer-object="dispatchTransferObject" />
 
 
-        <PageHeader class="">
-          {{ pageTitle }}
+        <PageHeader :page-title="pageTitle" class="">
           <template #primary>
             <DispatchUpdateButton />
           </template>
@@ -39,12 +35,6 @@
         v-model:selectedId="selectedId"
         :character-ids="characterIds"
       />
-      <!--      <div class="absolute inset-0 py-6 px-4 sm:px-6 lg:px-8 overflow-y-auto">
-        <MailList
-          v-model:selectedId="selectedId"
-          :character-ids="characterIds"
-        />
-      </div>-->
     </template>
   </MultiColumnLayout>
 </template>

diff --git a/resources/js/Pages/Character/Skill/Index.vue b/resources/js/Pages/Character/Skill/Index.vue
@@ -1,13 +1,9 @@
 <template>
   <div class="space-y-3">
-    <teleport to="#head">
-      <title>{{ title(pageTitle) }}</title>
-    </teleport>
 
     <RequiredScopesWarning :dispatch-transfer-object="dispatchTransferObject" />
 
-    <PageHeader>
-      {{ pageTitle }}
+    <PageHeader :page-title="pageTitle">
       <template #primary>
         <DispatchUpdateButton />
       </template>

diff --git a/resources/js/Pages/Character/Wallet/Index.vue b/resources/js/Pages/Character/Wallet/Index.vue
@@ -1,13 +1,8 @@
 <template>
   <div class="space-y-3">
-    <teleport to="#head">
-      <title>{{ title(pageTitle) }}</title>
-    </teleport>
-
     <RequiredScopesWarning :dispatch-transfer-object="dispatchTransferObject" />
 
-    <PageHeader>
-      {{ pageTitle }}
+    <PageHeader :page-title="pageTitle">
       <template #primary>
         <DispatchUpdateButton />
       </template>

diff --git a/resources/js/Pages/Configuration/ManualLocations/ManualLocation.vue b/resources/js/Pages/Configuration/ManualLocations/ManualLocation.vue
@@ -1,12 +1,6 @@
 <template>
   <div class="space-y-3">
-    <teleport to="#head">
-      <title>{{ title(pageTitle) }}</title>
-    </teleport>
-
-    <PageHeader>
-      {{ pageTitle }}
-    </PageHeader>
+    <PageHeader :page-title="pageTitle" />
 
     <CompleteInertiaLoaderHelper
       :key="infiniteId"

diff --git a/resources/js/Pages/Configuration/Performance/Overview.vue b/resources/js/Pages/Configuration/Performance/Overview.vue
@@ -1,12 +1,6 @@
 <template>
   <div class="space-y-3">
-    <teleport to="#head">
-      <title>{{ title(pageTitle) }}</title>
-    </teleport>
-
-    <PageHeader>
-      {{ pageTitle }}
-    </PageHeader>
+    <PageHeader :page-title="pageTitle" />
 
     <CompleteInertiaLoaderHelper v-slot="{data}">
       <Card>