From a60fa508c7be8eb8e77136b6e07a3da54388f2ad Mon Sep 17 00:00:00 2001 From: "kreaweb.be" Date: Fri, 24 May 2024 18:12:35 +0200 Subject: [PATCH] delete team avatars folder --- app/Actions/Jetstream/DeleteTeam.php | 5 +++ config/filesystems.php | 13 +++++- lang/de/team.php | 36 +++++++++++++++ lang/en/team.php | 37 ++++++++++++++++ lang/nl/team.php | 36 +++++++++++++++ .../views/livewire/gedcom/import.blade.php | 15 +++---- .../views/teams/create-team-form.blade.php | 4 +- .../views/teams/delete-team-form.blade.php | 6 +-- .../views/teams/team-member-manager.blade.php | 44 +++++++++---------- .../teams/update-team-name-form.blade.php | 4 +- 10 files changed, 160 insertions(+), 40 deletions(-) diff --git a/app/Actions/Jetstream/DeleteTeam.php b/app/Actions/Jetstream/DeleteTeam.php index 2873a779..8f58f430 100644 --- a/app/Actions/Jetstream/DeleteTeam.php +++ b/app/Actions/Jetstream/DeleteTeam.php @@ -17,6 +17,11 @@ public function delete(Team $team): void // delete team photo folder // ----------------------------------------------------------------------- Storage::disk('photos')->deleteDirectory($team->id); + + // ----------------------------------------------------------------------- + // delete team avatars folder + // ----------------------------------------------------------------------- + Storage::disk('avatars')->deleteDirectory($team->id); // ----------------------------------------------------------------------- $team->purge(); diff --git a/config/filesystems.php b/config/filesystems.php index 863dbbd7..76b9fbd9 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -43,7 +43,7 @@ 'throw' => false, ], - //photos + // photos 'photos' => [ 'driver' => 'local', 'root' => storage_path('app/public/photos'), @@ -52,7 +52,16 @@ 'throw' => false, ], - //profile-pictures + // avatars + 'photos' => [ + 'driver' => 'local', + 'root' => storage_path('app/public/avatars'), + 'url' => env('APP_URL') . '/storage/avatars', + 'visibility' => 'public', + 'throw' => false, + ], + + // profile-pictures 'profiles' => [ 'driver' => 'local', 'root' => storage_path('app/public/profiles'), diff --git a/lang/de/team.php b/lang/de/team.php index 9dce8bf2..6a3f3abc 100644 --- a/lang/de/team.php +++ b/lang/de/team.php @@ -23,4 +23,40 @@ 'team_personal' => 'Persönliches Team', 'teams' => 'Teams', 'users' => 'Benutzer', + + // Messages + 'team_details' => 'Teamdetails', + 'team_create_new' => 'Create a new team to collaborate with others.', + 'team_create_new_gedcom' => 'Erstellen Sie ein neues Team, um mit anderen zusammenzuarbeiten.', + 'team_gedcom_reference' => 'Referenz', + 'team_gedcom_specifications' => 'GEDCOM-Spezifikationen', + 'team_gedcom_version' => 'Maximale GEDCOM-Version 5.5.5', + 'team_gedcom_hint' => 'Lassen Sie uns ein Team basierend auf einer GEDCOM-Datei erstellen.', + 'team_gedcom_tip' => 'Ziehen Sie Ihre GEDCOM-Datei per Drag & Drop hierher', + + 'team_name' => 'Teamname', + 'team_information' => 'Der Name und die Eigentümerinformationen des Teams.', + 'team_add_member' => 'Teammitglied hinzufügen', + 'team_add_member_message' => 'Fügen Sie Ihrem Team ein neues Teammitglied hinzu, damit es mit Ihnen zusammenarbeiten kann.', + 'team_provide' => 'Bitte geben Sie die E-Mail-Adresse der Person an, die Sie diesem Team hinzufügen möchten.', + 'email' => 'Email', + 'role' => 'Rolle', + + 'team_pending' => 'Ausstehende Teameinladungen', + 'team_pending_message' => 'Diese Personen wurden in Ihr Team eingeladen und haben eine Einladungs-E-Mail erhalten. Sie können dem Team beitreten, indem Sie die E-Mail-Einladung annehmen.', + + 'team_members' => 'Teammitglieder', + 'team_members_message' => 'Alle Menschen, die Teil dieses Teams sind.', + 'manage_role' => 'Rolle verwalten', + 'leave' => 'Verlassen', + 'leave_team' => 'Team verlassen', + 'leave_team_sure' => 'Sind Sie sicher, dass Sie dieses Team verlassen möchten?', + 'remove' => 'Entfernen', + 'remove_member' => 'Teammitglied entfernen', + 'remove_member_sure' => 'Sind Sie sicher, dass Sie diese Person aus dem Team entfernen möchten?', + + 'delete_team_meassage' => 'Dieses Team dauerhaft löschen.', + 'delete_team_text' => 'Sobald ein Team gelöscht wird, werden alle seine Ressourcen und Daten dauerhaft gelöscht. Bevor Sie dieses Team löschen, laden Sie bitte alle Daten oder Informationen zu diesem Team herunter, die Sie behalten möchten.', + 'delete_team_sure' => 'Sind Sie sicher, dass Sie dieses Team löschen möchten? Sobald ein Team gelöscht wird, werden alle seine Ressourcen und Daten dauerhaft gelöscht.', + ]; diff --git a/lang/en/team.php b/lang/en/team.php index c7c6cf01..fcf7aa52 100644 --- a/lang/en/team.php +++ b/lang/en/team.php @@ -23,4 +23,41 @@ 'team_personal' => 'Personal team', 'teams' => 'Teams', 'users' => 'Users', + + // Messages + 'team_details' => 'Team Details', + 'team_create_new' => 'Create a new team to collaborate with others.', + 'team_create_new_gedcom' => 'Create a new team, imported from a GEDCOM file, to collaborate with others.', + 'team_gedcom_reference' => 'Reference', + 'team_gedcom_specifications' => 'GEDCOM Specifications', + 'team_gedcom_version' => 'Maximal GEDCOM version 5.5.5', + 'team_gedcom_hint' => 'Let\'s create a team based on a GEDCOM file', + 'team_gedcom_tip' => 'Drag and drop your GEDCOM file here', + + 'team_name' => 'Team Name', + 'team_information' => 'The team\'s name and owner information.', + 'team_add_member' => 'Add Team Member', + 'team_add_member_message' => 'Add a new team member to your team, allowing them to collaborate with you.', + 'team_provide' => 'Please provide the email address of the person you would like to add to this team.', + 'email' => 'Email', + 'role' => 'Role', + + 'team_pending' => 'Pending Team Invitations', + 'team_pending_message' => 'These people have been invited to your team and have been sent an invitation email. They may join the team by accepting the email invitation.', + + 'team_members' => 'Team members', + 'team_members_message' => 'All of the people that are part of this team.', + 'manage_role' => 'Manage role', + 'leave' => 'Leave', + 'leave_team' => 'Leave Team', + 'leave_team_sure' => 'Are you sure you would like to leave this team?', + 'remove' => 'Remove', + 'remove_member' => 'Remove Team Member', + 'remove_member_sure' => 'Are you sure you would like to remove this person from the team?', + + + 'delete_team_meassage' => 'Permanently delete this team.', + 'delete_team_text' => 'Once a team is deleted, all of its resources and data will be permanently deleted. Before deleting this team, please download any data or information regarding this team that you wish to retain.', + 'delete_team_sure' => 'Are you sure you want to delete this team? Once a team is deleted, all of its resources and data will be permanently deleted.', + ]; diff --git a/lang/nl/team.php b/lang/nl/team.php index c8b2c31a..e187ec78 100644 --- a/lang/nl/team.php +++ b/lang/nl/team.php @@ -23,4 +23,40 @@ 'team_personal' => 'Persoonlijk team', 'teams' => 'Teams', 'users' => 'Gebruikers', + + // Messages + 'team_details' => 'Teamdetails', + 'team_create_new' => 'Creëer een nieuw team om met anderen samen te werken.', + 'team_create_new_gedcom' => 'Creëer een nieuw team, geïmporteerd uit een GEDCOM-bestand, om met anderen samen te werken.', + 'team_gedcom_reference' => 'Referentie', + 'team_gedcom_specifications' => 'GEDCOM Specificaties', + 'team_gedcom_version' => 'Maximaal GEDCOM versie 5.5.5', + 'team_gedcom_hint' => 'Laten we een team creëren op basis van een GEDCOM-bestand', + 'team_gedcom_tip' => 'Sleep uw GEDCOM-bestand hierheen', + + 'team_name' => 'Teamnaam', + 'team_information' => 'De naam van het team en informatie over de eigenaar.', + 'team_add_member' => 'Teamlid toevoegen', + 'team_add_member_message' => 'Voeg een nieuw teamlid toe aan uw team, zodat deze met u kan samenwerken.', + 'team_provide' => 'Geef het e-mailadres op van de persoon die u aan dit team wilt toevoegen.', + 'email' => 'E-mail', + 'role' => 'Rol', + + 'team_pending' => 'Teamuitnodigingen in behandeling', + 'team_pending_message' => 'Deze mensen zijn uitgenodigd voor uw team en hebben een uitnodigingsmail ontvangen. Ze kunnen lid worden van het team door de uitnodiging in de e-mail te accepteren.', + + 'team_members' => 'Leden van het team', + 'team_members_message' => 'Alle personen die deel uitmaken van dit team.', + 'manage_role' => 'Rol beheren', + 'leave' => 'Verlaten', + 'leave_team' => 'Verlaat team', + 'leave_team_sure' => 'Weet je zeker dat je dit team wilt verlaten?', + 'remove' => 'Verwijder', + 'remove_member' => 'Teamlid verwijderen', + 'remove_member_sure' => 'Weet u zeker dat u deze persoon uit het team wilt verwijderen?', + + 'delete_team_meassage' => 'Verwijder dit team definitief.', + 'delete_team_text' => 'Zodra een team is verwijderd, worden alle bronnen en gegevens permanent verwijderd. Voordat u dit team verwijdert, downloadt u alle gegevens of informatie over dit team die u wilt behouden.', + 'delete_team_sure' => 'Weet u zeker dat u dit team wilt verwijderen? Zodra een team is verwijderd, worden alle bronnen en gegevens permanent verwijderd.', + ]; diff --git a/resources/views/livewire/gedcom/import.blade.php b/resources/views/livewire/gedcom/import.blade.php index 8d0a2b43..d64156c1 100644 --- a/resources/views/livewire/gedcom/import.blade.php +++ b/resources/views/livewire/gedcom/import.blade.php @@ -1,19 +1,19 @@
- {{ __('Team Details') }} + {{ __('team.team_details') }}
- {{ __('Create a new team, imported from a GEDCOM file, to collaborate with others.') }} + {{ __('team.team_create_new_gedcom') }}

-

Reference : - +

{{ __('team.team_gedcom_reference') }} : +

@@ -50,12 +50,9 @@ {{-- gedcom file input --}}
- + - - Maximal GEDCOM version 5.5.5 - + {{ __('team.team_gedcom_version') }}
diff --git a/resources/views/teams/create-team-form.blade.php b/resources/views/teams/create-team-form.blade.php index 8e41591e..0f4b223a 100644 --- a/resources/views/teams/create-team-form.blade.php +++ b/resources/views/teams/create-team-form.blade.php @@ -1,13 +1,13 @@
- {{ __('Team Details') }} + {{ __('team.team_details') }}
- {{ __('Create a new team to collaborate with others.') }} + {{ __('team.team_create_new') }}
diff --git a/resources/views/teams/delete-team-form.blade.php b/resources/views/teams/delete-team-form.blade.php index e8c26d21..fb73475b 100644 --- a/resources/views/teams/delete-team-form.blade.php +++ b/resources/views/teams/delete-team-form.blade.php @@ -7,7 +7,7 @@
- {{ __('Permanently delete this team.') }} + {{ __('team.delete_team_meassage') }}
@@ -27,7 +27,7 @@
- {{ __('Once a team is deleted, all of its resources and data will be permanently deleted. Before deleting this team, please download any data or information regarding this team that you wish to retain.') }} + {{ __('team.delete_team_text') }}
@@ -43,7 +43,7 @@ - {{ __('Are you sure you want to delete this team? Once a team is deleted, all of its resources and data will be permanently deleted.') }} + {{ __('team.delete_team_sure') }} diff --git a/resources/views/teams/team-member-manager.blade.php b/resources/views/teams/team-member-manager.blade.php index e48a0157..0749c702 100644 --- a/resources/views/teams/team-member-manager.blade.php +++ b/resources/views/teams/team-member-manager.blade.php @@ -7,26 +7,26 @@
- {{ __('Add Team Member') }} + {{ __('team.team_add_member') }}
- {{ __('Add a new team member to your team, allowing them to collaborate with you.') }} + {{ __('team.team_add_member_message') }}
- {{ __('Please provide the email address of the person you would like to add to this team.') }} + {{ __('team.team_provide') }}
{{-- member email --}}
- +
@@ -34,7 +34,7 @@ {{-- role --}} @if (count($this->roles) > 0)
- +
@@ -87,13 +87,13 @@ class="relative px-4 py-3 inline-flex w-full rounded focus:z-10 focus:outline-no
- {{ __('Pending Team Invitations') }} + {{ __('team.team_pending') }}
- {{ __('These people have been invited to your team and have been sent an invitation email. They may join the team by accepting the email invitation.') }} + {{ __('team.team_pending_message') }}
@@ -127,13 +127,13 @@ class="relative px-4 py-3 inline-flex w-full rounded focus:z-10 focus:outline-no
- {{ __('Team Members') }} + {{ __('team.team_members') }}
- {{ __('All of the people that are part of this team.') }} + {{ __('team.team_members_message') }}
@@ -162,13 +162,13 @@ class="relative px-4 py-3 inline-flex w-full rounded focus:z-10 focus:outline-no {{-- leave team --}} @if ($this->user->id === $user->id) {{-- remove team member --}} @elseif (Gate::check('removeTeamMember', $team)) @endif
@@ -183,7 +183,7 @@ class="relative px-4 py-3 inline-flex w-full rounded focus:z-10 focus:outline-no {{-- role management modal --}} - {{ __('Manage Role') }} + {{ __('team.manage_role') }} @@ -216,11 +216,11 @@ class="relative px-4 py-3 inline-flex w-full rounded focus:z-10 focus:outline-no - {{ __('Cancel') }} + {{ __('app.cancel') }} - {{ __('Save') }} + {{ __('app.save') }} @@ -228,20 +228,20 @@ class="relative px-4 py-3 inline-flex w-full rounded focus:z-10 focus:outline-no {{-- leave team confirmation modal --}} - {{ __('Leave Team') }} + {{ __('team.leave_team') }} - {{ __('Are you sure you would like to leave this team?') }} + {{ __('team_leave_team_sure') }} - {{ __('Cancel') }} + {{ __('app.cancel') }} - {{ __('Leave') }} + {{ __('team.leave') }} @@ -249,20 +249,20 @@ class="relative px-4 py-3 inline-flex w-full rounded focus:z-10 focus:outline-no {{-- remove team member confirmation modal --}} - {{ __('Remove Team Member') }} + {{ __('team.remove_menber') }} - {{ __('Are you sure you would like to remove this person from the team?') }} + {{ __('team.remove_member_sure') }} - {{ __('Cancel') }} + {{ __('app.cancel') }} - {{ __('Remove') }} + {{ __('team.remove') }} diff --git a/resources/views/teams/update-team-name-form.blade.php b/resources/views/teams/update-team-name-form.blade.php index 570e9354..baadc784 100644 --- a/resources/views/teams/update-team-name-form.blade.php +++ b/resources/views/teams/update-team-name-form.blade.php @@ -1,13 +1,13 @@
- {{ __('Team Name') }} + {{ __('team.team_name') }}
- {{ __('The team\'s name and owner information.') }} + {{ __('team.team_information') }}