From f951cd70664b02c171c0a6fb04a724dbda51e2ec Mon Sep 17 00:00:00 2001 From: K Muller Date: Fri, 17 Oct 2025 14:27:16 +0200 Subject: [PATCH] feat: :sparkles: add counter to the contact form submit --- .../Controllers/Back/ContactController.php | 23 ++++ .../Controllers/Front/ContactController.php | 6 ++ app/Http/Middleware/HandleInertiaRequests.php | 4 + app/Models/ContactCount.php | 28 +++++ app/Policies/ContactCountPolicy.php | 18 ++++ ..._16_145827_create_contact_counts_table.php | 29 +++++ lang/en/front.php | 1 + lang/en/models.php | 1 + lang/en/validation.php | 4 + lang/fr/front.php | 1 + lang/fr/models.php | 1 + lang/fr/validation.php | 4 + .../ts/back/Components/Layout/AppSidebar.tsx | 100 ++++++++++-------- .../ts/back/Components/Table/DataTable.tsx | 24 +++-- .../ts/back/Pages/ContactCount/Index.tsx | 53 ++++++++++ resources/ts/back/types/global.d.ts | 8 +- routes/breadcrumbs-back.php | 10 ++ routes/web-back.php | 4 + 18 files changed, 262 insertions(+), 57 deletions(-) create mode 100644 app/Http/Controllers/Back/ContactController.php create mode 100644 app/Models/ContactCount.php create mode 100644 app/Policies/ContactCountPolicy.php create mode 100644 database/migrations/2025_10_16_145827_create_contact_counts_table.php create mode 100644 resources/ts/back/Pages/ContactCount/Index.tsx diff --git a/app/Http/Controllers/Back/ContactController.php b/app/Http/Controllers/Back/ContactController.php new file mode 100644 index 00000000..b7424cc1 --- /dev/null +++ b/app/Http/Controllers/Back/ContactController.php @@ -0,0 +1,23 @@ +paginate($query); + $formTypeEnum = ContactFormType::toArray(); + return Inertia::render('ContactCount/Index', [ + 'contactCountModels' => CommonResource::collection($contactCountModels), + 'contactFormType' => $formTypeEnum, + ]); + } +} diff --git a/app/Http/Controllers/Front/ContactController.php b/app/Http/Controllers/Front/ContactController.php index 2745a949..7902c2ae 100644 --- a/app/Http/Controllers/Front/ContactController.php +++ b/app/Http/Controllers/Front/ContactController.php @@ -7,6 +7,7 @@ use App\Exceptions\AbortContactMailer; use App\Http\Requests\Front\Contact\ContactRequest; use App\Models\MailContactData; use App\Jobs\Mails\SendContactMail; +use App\Models\ContactCount; use Illuminate\Support\Facades\Log; use LDC\LDCCRM\Enums\ApiError; use LDC\LDCCRM\Exceptions\ApiErrorException; @@ -70,6 +71,11 @@ class ContactController $newsletterMessage = trans('Une erreur est survenue lors de l\'inscription à la newsletter, merci de réessayer ultérieurement.'); } } + ContactCount::updateOrInsert( + ['type' => $data['enumType']], + ['submissions' => \DB::raw('submissions + 1')] + ); + $contactMessage = trans('Votre message a bien été envoyé.'); $message = $newsletterMessage ? $contactMessage. '
' . $newsletterMessage : $contactMessage; return redirect()->back() diff --git a/app/Http/Middleware/HandleInertiaRequests.php b/app/Http/Middleware/HandleInertiaRequests.php index 05c62a09..1e24b21d 100644 --- a/app/Http/Middleware/HandleInertiaRequests.php +++ b/app/Http/Middleware/HandleInertiaRequests.php @@ -7,6 +7,7 @@ use App\Enums\DynamicPages\PageStatusEnum; use App\Helpers\TranslationHelper; use App\Models\DynamicPage; use App\Models\PageConfig; +use App\Models\ContactCount; use Diglactic\Breadcrumbs\Breadcrumbs; use Illuminate\Http\Request; use Illuminate\Support\Facades\Gate; @@ -73,6 +74,9 @@ class HandleInertiaRequests extends Middleware 'viewTrash' => Gate::allows('viewTrash', PageConfig::class), 'create' => Gate::allows('create', PageConfig::class), ], + 'contact_counts' => [ + "viewAny" => Gate::allows('viewAny', ContactCount::class) + ] ] ], 'enumItemsPerPagination' => ItemsPerPaginationEnum::toArray(), diff --git a/app/Models/ContactCount.php b/app/Models/ContactCount.php new file mode 100644 index 00000000..95371c91 --- /dev/null +++ b/app/Models/ContactCount.php @@ -0,0 +1,28 @@ + + */ + protected $fillable = [ + 'type', + 'submissions' + ]; + + /** + * The attributes that should be cast. + * + * @var array + */ + protected $casts = [ + 'type' => ContactFormType::class, + ]; +} diff --git a/app/Policies/ContactCountPolicy.php b/app/Policies/ContactCountPolicy.php new file mode 100644 index 00000000..bfab7a2e --- /dev/null +++ b/app/Policies/ContactCountPolicy.php @@ -0,0 +1,18 @@ +id(); + $table->integer('submissions')->comment('How many contact form have been submitted')->default(0); + $table->unsignedTinyInteger('type')->unique()->comment('Enum du type de contact form'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('contact_counts'); + } +}; diff --git a/lang/en/front.php b/lang/en/front.php index aff6d4f4..8c7e8caa 100644 --- a/lang/en/front.php +++ b/lang/en/front.php @@ -25,6 +25,7 @@ return [ 'back_to_contact' => 'return to choice of contact' ], 'contact' => [ + "index" => "Contact us", 'you_want_job_offer' => 'Would you like to find out about our job offers, internships and apprenticeships, or would like to send us a spontaneous application? Click :', 'if_other_subject_thanks_to' => 'If your request relates to a different matter, please telephone the HR department of the company in question.', 'are_you_breeder_and_join_us' => 'Are you a poultry farmer or would you like to become one and join us? ', diff --git a/lang/en/models.php b/lang/en/models.php index 55a8d0ce..5e214d7d 100644 --- a/lang/en/models.php +++ b/lang/en/models.php @@ -6,5 +6,6 @@ return [ "dynamic-page" => "dynamic page|dynamic pages", "page-config" => "page configuration|page configurations", "activity-log" => "activity log", + "contact-count" => "contact form", ], ]; diff --git a/lang/en/validation.php b/lang/en/validation.php index 403a8808..37a822a0 100644 --- a/lang/en/validation.php +++ b/lang/en/validation.php @@ -235,5 +235,9 @@ return [ "locked" => "locked", "field" => "field", "key" => "key", + "contactCount" => [ + "type" => "form type", + "submissions" => "count of soumissions" + ] ], ]; diff --git a/lang/fr/front.php b/lang/fr/front.php index 4444b55e..9a21f8f5 100644 --- a/lang/fr/front.php +++ b/lang/fr/front.php @@ -23,6 +23,7 @@ return [ 'back_to_contact' => 'retour au choix de contact' ], 'contact' => [ + "index" => "Nous contacter", 'you_want_job_offer' => 'Vous souhaitez consulter nos offres d’emploi, de stage et d’alternance ; ou nous adresser une candidature spontanée ? Cliquez ici :', 'if_other_subject_thanks_to' => 'Si votre demande concerne un autre sujet, merci de contacter par téléphone le service RH de la société concernée.', 'are_you_breeder_and_join_us' => 'Vous êtes éleveur de volailles ou souhaitez le devenir, et nous rejoindre ? ', diff --git a/lang/fr/models.php b/lang/fr/models.php index 6edbfad2..28cd4510 100644 --- a/lang/fr/models.php +++ b/lang/fr/models.php @@ -6,5 +6,6 @@ return [ "dynamic-page" => "page dynamique|pages dynamiques", "page-config" => "configuration de page|configurations de page", "activity-log" => "journal d'activité", + "contact-count" => "formulaire de contact", ], ]; diff --git a/lang/fr/validation.php b/lang/fr/validation.php index ee8577bf..eca349d3 100644 --- a/lang/fr/validation.php +++ b/lang/fr/validation.php @@ -237,5 +237,9 @@ return [ "locked" => "vérouillé", "field" => "champs", "key" => "clé", + "contactCount" => [ + "type" => "type de formulaire", + "submissions" => "nombre de soumissions" + ] ], ]; diff --git a/resources/ts/back/Components/Layout/AppSidebar.tsx b/resources/ts/back/Components/Layout/AppSidebar.tsx index 56ae39ee..cfbc3fa3 100644 --- a/resources/ts/back/Components/Layout/AppSidebar.tsx +++ b/resources/ts/back/Components/Layout/AppSidebar.tsx @@ -11,6 +11,7 @@ import { StickyNote, Cog, History, + Contact, } from "lucide-react"; import { route } from "ziggy-js"; // * Components shadcn @@ -109,44 +110,56 @@ export default function AppSidebar() { model: "dynamic-pages", show: authPolicies.dynamicPages.viewAny, icon: StickyNote, - actions: (model: string) => filterActions({ items: [ - authPolicies.dynamicPages.create && ( - - ), - authPolicies.dynamicPages.viewTrash && ( - - ), - ]}) + actions: (model: string) => filterActions({ + items: [ + authPolicies.dynamicPages.create && ( + + ), + authPolicies.dynamicPages.viewTrash && ( + + ), + ] + }) }, { title: str(useTrans("models.classes.page-config", { choice: 2 })).ucFirst().value(), model: "page-configs", show: authPolicies.pageConfigs.viewAny, icon: Cog, - actions: (model: string) => filterActions({ items: [ - authPolicies.pageConfigs.create && ( - - ), - authPolicies.pageConfigs.viewTrash && ( - - ), - ]}) + actions: (model: string) => filterActions({ + items: [ + authPolicies.pageConfigs.create && ( + + ), + authPolicies.pageConfigs.viewTrash && ( + + ), + ] + }) + }, + { + title: str(useTrans("models.classes.contact-count")) + .ucFirst() + .value(), + model: "contact-counts", + icon: Contact, + show: auth.policies.contact_counts.viewAny, }, ], }, @@ -245,11 +258,10 @@ export default function AppSidebar() { (navLink) => { const sidebarButton = ( {navLink.link ? ( @@ -275,11 +287,10 @@ export default function AppSidebar() { return (navLink.show && ( {isCollapsed ? ( @@ -297,11 +308,10 @@ export default function AppSidebar() { diff --git a/resources/ts/back/Components/Table/DataTable.tsx b/resources/ts/back/Components/Table/DataTable.tsx index 2fc2426f..b8b08469 100644 --- a/resources/ts/back/Components/Table/DataTable.tsx +++ b/resources/ts/back/Components/Table/DataTable.tsx @@ -33,7 +33,7 @@ export default function DataTable({ columns: ColumnDef[]; modelRoute: string; modelsPaginate: Resource; - actions: Views; + actions: Views | null; }) { const [sorting, setSorting] = useState([]); const data = modelsPaginate.data as TData[]; @@ -62,16 +62,18 @@ export default function DataTable({ {header.isPlaceholder ? null : flexRender( - header.column.columnDef.header, + header.column.columnDef + .header, header.getContext(), - ) - } + )} ); })} - - - + {actions && ( + + + + )} ))} @@ -93,16 +95,16 @@ export default function DataTable({ )} ))} - - {actions.length > 0 && ( + {actions && ( + - )} - + + )} )) ) : ( diff --git a/resources/ts/back/Pages/ContactCount/Index.tsx b/resources/ts/back/Pages/ContactCount/Index.tsx new file mode 100644 index 00000000..f4097286 --- /dev/null +++ b/resources/ts/back/Pages/ContactCount/Index.tsx @@ -0,0 +1,53 @@ +import { Row } from "@tanstack/react-table"; +// * Other +import AuthenticatedLayout from "@/back/Layouts/AuthenticatedLayout"; +import DataTable from "@/back/Components/Table/DataTable"; +import { + ContactCountModel, + LaravelEnum, + Resource, +} from "@/back/types/global"; +import str from "@/hooks/use-string"; +import useTrans from "@/hooks/use-translations"; + +export default function Index({ + contactCountModels, + contactFormType +}: { + contactCountModels: Resource; + contactFormType: LaravelEnum +}) { + const columns = [ + { + accessorKey: "type", + header: ({ column }: { column: { id: string } }) => ( +

{str(useTrans(`validation.custom.contactCount.${column.id}`)).ucFirst().value()}

+ ), + cell: ({ row }: { row: Row }) => { + const type = Object.values(contactFormType).find(item => item.value === (row.getValue("type"))); + if(!type) return; + return (

{str(type.label).ucFirst().value()}

); + } + }, + { + accessorKey: "submissions", + header: ({ column }: { column: { id: string } }) => ( +

{str(useTrans(`validation.custom.contactCount.${column.id}`)).ucFirst().value()}

+ ), + }, + ]; + + const transModel = useTrans("models.classes.contact-count"); + const transTitle = str(transModel).ucFirst().value(); + return ( + + + + ); +} diff --git a/resources/ts/back/types/global.d.ts b/resources/ts/back/types/global.d.ts index f6194c2a..fb66a621 100644 --- a/resources/ts/back/types/global.d.ts +++ b/resources/ts/back/types/global.d.ts @@ -150,7 +150,13 @@ type CommonPolicy = { create: boolean; }; -// Authentication props with user and policies. +// ContactCount Type +type ContactCountModel = { + submissions: number; + type: string; +}; + +// Authentication props with user and policies type AuthProp = { user: UserModel; policies: Record; diff --git a/routes/breadcrumbs-back.php b/routes/breadcrumbs-back.php index 405e58bc..d6a7c467 100644 --- a/routes/breadcrumbs-back.php +++ b/routes/breadcrumbs-back.php @@ -115,3 +115,13 @@ Breadcrumbs::for('back.activity-logs.show', function (Generator $trail) { $trail->parent('back.activity-logs.index'); $trail->push(Str::ucfirst(trans('crud.actions.visualize'))); }); + + +// * CONTACT COUNT +Breadcrumbs::for('back.contact-counts.index', function (Generator $trail) { + $trail->parent('back.dashboard.index'); + $trail->push( + Str::of(trans('models.classes.contact-count'))->ucfirst(), + route('back.contact-counts.index') + ); +}); diff --git a/routes/web-back.php b/routes/web-back.php index 9e849b52..eaabb440 100644 --- a/routes/web-back.php +++ b/routes/web-back.php @@ -5,6 +5,7 @@ use App\Http\Controllers\Back\DynamicPageController; use App\Http\Controllers\Back\PageConfigController; use App\Http\Controllers\Back\UploadController; use Illuminate\Http\Request; +use App\Http\Controllers\Back\ContactController; use Illuminate\Support\Facades\Route; use Inertia\Inertia; use Uwil\LaravelBackend\Controllers\AuthenticatedSessionController; @@ -57,6 +58,9 @@ Route::prefix('admin') // * UPLOAD (USED FOR WYSIWYG). Route::post('/wysiwyg/upload', [UploadController::class, 'uploadFile'])->name('wysiwyg.upload'); + + // * CONTACT COUNT + Route::get('/contact-counts', [ContactController::class, 'index'])->name('contact-counts.index'); }); // * UPDATE LANGUAGES.