From 74cc0a07c2be02e1c932382de0b3c4a33bdc6133 Mon Sep 17 00:00:00 2001
From: Shuvro Roy <shuvro.roy@northsouth.edu>
Date: Thu, 7 Jan 2021 01:21:14 +0600
Subject: [PATCH 1/3] [2.x] Make a similar footer section on welcome page
 (#602)

* [2.x] Make a similar footer section on welcome page

* Update web.php

Co-authored-by: Dries Vints <dries@vints.io>
---
 stubs/inertia/resources/js/Pages/Welcome.vue | 3 ++-
 stubs/inertia/routes/web.php                 | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/stubs/inertia/resources/js/Pages/Welcome.vue b/stubs/inertia/resources/js/Pages/Welcome.vue
index c6d5f88fc..e798c0c98 100644
--- a/stubs/inertia/resources/js/Pages/Welcome.vue
+++ b/stubs/inertia/resources/js/Pages/Welcome.vue
@@ -103,7 +103,7 @@
                 </div>
 
                 <div class="ml-4 text-center text-sm text-gray-500 sm:text-right sm:ml-0">
-                    Build v{{ laravelVersion }}
+                    Laravel v{{ laravelVersion }} (PHP v{{ phpVersion }})
                 </div>
             </div>
         </div>
@@ -180,6 +180,7 @@
             canLogin: Boolean,
             canRegister: Boolean,
             laravelVersion: String,
+            phpVersion: String,
         }
     }
 </script>
diff --git a/stubs/inertia/routes/web.php b/stubs/inertia/routes/web.php
index cb3ce4c47..825eeed46 100644
--- a/stubs/inertia/routes/web.php
+++ b/stubs/inertia/routes/web.php
@@ -20,6 +20,7 @@
         'canLogin' => Route::has('login'),
         'canRegister' => Route::has('register'),
         'laravelVersion' => Application::VERSION,
+        'phpVersion' => PHP_VERSION,
     ]);
 });
 

From e5c9199bd3e7417b2a2c25024601468b98361a4d Mon Sep 17 00:00:00 2001
From: Oscar Kolsrud <30559109+OscarKolsrud@users.noreply.github.com>
Date: Wed, 6 Jan 2021 20:33:02 +0100
Subject: [PATCH 2/3] Make translatable (#598)

Made the text on the buttons in the team invitation email translatable.
---
 resources/views/mail/team-invitation.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/mail/team-invitation.blade.php b/resources/views/mail/team-invitation.blade.php
index 31f942a43..37dbe2ef1 100644
--- a/resources/views/mail/team-invitation.blade.php
+++ b/resources/views/mail/team-invitation.blade.php
@@ -4,13 +4,13 @@
 {{ __('If you do not have an account, you may create one by clicking the button below. After creating an account, you may click the invitation acceptance button in this email to accept the team invitation:') }}
 
 @component('mail::button', ['url' => route('register')])
-Create Account
+{{ __('Create Account') }}
 @endcomponent
 
 {{ __('If you already have an account, you may accept this invitation by clicking the button below:') }}
 
 @component('mail::button', ['url' => $acceptUrl])
-Accept Invitation
+{{ __('Accept Invitation') }}
 @endcomponent
 
 {{ __('If you did not expect to receive an invitation to this team, you may discard this email.') }}

From bb913acd9b5ee7be2e0997b8439359aaad55c989 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20L=C3=A9t=C3=A9?= <bistory@gmail.com>
Date: Wed, 6 Jan 2021 20:33:16 +0100
Subject: [PATCH 3/3] [2.x] Remove unused Vue components (#597)

* Removed unused JetSectionBorder

* Removed unused JetActionMessage

* Removed unused JetButton
---
 stubs/inertia/resources/js/Pages/API/Index.vue            | 2 --
 stubs/inertia/resources/js/Pages/Teams/CreateTeamForm.vue | 2 --
 stubs/inertia/resources/js/Pages/Teams/DeleteTeamForm.vue | 2 --
 3 files changed, 6 deletions(-)

diff --git a/stubs/inertia/resources/js/Pages/API/Index.vue b/stubs/inertia/resources/js/Pages/API/Index.vue
index c338e7c50..51671f2e6 100644
--- a/stubs/inertia/resources/js/Pages/API/Index.vue
+++ b/stubs/inertia/resources/js/Pages/API/Index.vue
@@ -19,7 +19,6 @@
 <script>
     import ApiTokenManager from './ApiTokenManager'
     import AppLayout from '@/Layouts/AppLayout'
-    import JetSectionBorder from '@/Jetstream/SectionBorder'
 
     export default {
         props: [
@@ -31,7 +30,6 @@
         components: {
             ApiTokenManager,
             AppLayout,
-            JetSectionBorder,
         },
     }
 </script>
diff --git a/stubs/inertia/resources/js/Pages/Teams/CreateTeamForm.vue b/stubs/inertia/resources/js/Pages/Teams/CreateTeamForm.vue
index b62f0db0d..7ab0b6629 100644
--- a/stubs/inertia/resources/js/Pages/Teams/CreateTeamForm.vue
+++ b/stubs/inertia/resources/js/Pages/Teams/CreateTeamForm.vue
@@ -38,7 +38,6 @@
 </template>
 
 <script>
-    import JetActionMessage from '@/Jetstream/ActionMessage'
     import JetButton from '@/Jetstream/Button'
     import JetFormSection from '@/Jetstream/FormSection'
     import JetInput from '@/Jetstream/Input'
@@ -47,7 +46,6 @@
 
     export default {
         components: {
-            JetActionMessage,
             JetButton,
             JetFormSection,
             JetInput,
diff --git a/stubs/inertia/resources/js/Pages/Teams/DeleteTeamForm.vue b/stubs/inertia/resources/js/Pages/Teams/DeleteTeamForm.vue
index f022ea8db..7907feffd 100644
--- a/stubs/inertia/resources/js/Pages/Teams/DeleteTeamForm.vue
+++ b/stubs/inertia/resources/js/Pages/Teams/DeleteTeamForm.vue
@@ -45,7 +45,6 @@
 
 <script>
     import JetActionSection from '@/Jetstream/ActionSection'
-    import JetButton from '@/Jetstream/Button'
     import JetConfirmationModal from '@/Jetstream/ConfirmationModal'
     import JetDangerButton from '@/Jetstream/DangerButton'
     import JetSecondaryButton from '@/Jetstream/SecondaryButton'
@@ -55,7 +54,6 @@
 
         components: {
             JetActionSection,
-            JetButton,
             JetConfirmationModal,
             JetDangerButton,
             JetSecondaryButton,