feat: ✨ add counter to the contact form submit
This commit is contained in:
parent
02aee9020e
commit
f951cd7066
18 changed files with 262 additions and 57 deletions
23
app/Http/Controllers/Back/ContactController.php
Normal file
23
app/Http/Controllers/Back/ContactController.php
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Back;
|
||||
|
||||
use App\Enums\Contact\ContactFormType;
|
||||
use App\Models\ContactCount;
|
||||
use Inertia\Inertia;
|
||||
use Uwil\LaravelBackend\Resources\CommonResource;
|
||||
use Uwil\LaravelCommon\Controllers\Controller;
|
||||
|
||||
class ContactController extends Controller
|
||||
{
|
||||
public function index(): \Inertia\Response
|
||||
{
|
||||
$query = ContactCount::query();
|
||||
$contactCountModels = $this->paginate($query);
|
||||
$formTypeEnum = ContactFormType::toArray();
|
||||
return Inertia::render('ContactCount/Index', [
|
||||
'contactCountModels' => CommonResource::collection($contactCountModels),
|
||||
'contactFormType' => $formTypeEnum,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
|
@ -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. ' <br /> ' . $newsletterMessage : $contactMessage;
|
||||
return redirect()->back()
|
||||
|
|
|
|||
|
|
@ -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(),
|
||||
|
|
|
|||
28
app/Models/ContactCount.php
Normal file
28
app/Models/ContactCount.php
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use App\Enums\Contact\ContactFormType;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
class ContactCount extends Model
|
||||
{
|
||||
/**
|
||||
* The attributes that are mass assignable.
|
||||
*
|
||||
* @var array<int, string>
|
||||
*/
|
||||
protected $fillable = [
|
||||
'type',
|
||||
'submissions'
|
||||
];
|
||||
|
||||
/**
|
||||
* The attributes that should be cast.
|
||||
*
|
||||
* @var array<string, string>
|
||||
*/
|
||||
protected $casts = [
|
||||
'type' => ContactFormType::class,
|
||||
];
|
||||
}
|
||||
18
app/Policies/ContactCountPolicy.php
Normal file
18
app/Policies/ContactCountPolicy.php
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
<?php
|
||||
|
||||
namespace App\Policies;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Uwil\LaravelBackend\Enums\RoleEnum;
|
||||
use Uwil\LaravelBackend\Policies\Rules\UserStaticRules;
|
||||
|
||||
class ContactCountPolicy
|
||||
{
|
||||
/**
|
||||
* Determine whether the user can view any models.
|
||||
*/
|
||||
public function viewAny(Model $authModel): bool
|
||||
{
|
||||
return UserStaticRules::atLeastRole($authModel, RoleEnum::admin);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
return new class extends Migration
|
||||
{
|
||||
/**
|
||||
* Run the migrations.
|
||||
*/
|
||||
public function up(): void
|
||||
{
|
||||
Schema::create('contact_counts', function (Blueprint $table) {
|
||||
$table->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');
|
||||
}
|
||||
};
|
||||
|
|
@ -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? ',
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
],
|
||||
];
|
||||
|
|
|
|||
|
|
@ -235,5 +235,9 @@ return [
|
|||
"locked" => "locked",
|
||||
"field" => "field",
|
||||
"key" => "key",
|
||||
"contactCount" => [
|
||||
"type" => "form type",
|
||||
"submissions" => "count of soumissions"
|
||||
]
|
||||
],
|
||||
];
|
||||
|
|
|
|||
|
|
@ -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 ? ',
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
],
|
||||
];
|
||||
|
|
|
|||
|
|
@ -237,5 +237,9 @@ return [
|
|||
"locked" => "vérouillé",
|
||||
"field" => "champs",
|
||||
"key" => "clé",
|
||||
"contactCount" => [
|
||||
"type" => "type de formulaire",
|
||||
"submissions" => "nombre de soumissions"
|
||||
]
|
||||
],
|
||||
];
|
||||
|
|
|
|||
|
|
@ -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 && (
|
||||
<CustomDropdownMenuItem
|
||||
key="create"
|
||||
route={route(`back.${model}.create`)}
|
||||
/>
|
||||
),
|
||||
authPolicies.dynamicPages.viewTrash && (
|
||||
<CustomDropdownMenuItem
|
||||
key="trash"
|
||||
route={route(`back.${model}.trash`)}
|
||||
icon={Views.ARCHIVATION.icon}
|
||||
trans={str(useTrans("back.archives")).ucFirst().value()}
|
||||
/>
|
||||
),
|
||||
]})
|
||||
actions: (model: string) => filterActions({
|
||||
items: [
|
||||
authPolicies.dynamicPages.create && (
|
||||
<CustomDropdownMenuItem
|
||||
key="create"
|
||||
route={route(`back.${model}.create`)}
|
||||
/>
|
||||
),
|
||||
authPolicies.dynamicPages.viewTrash && (
|
||||
<CustomDropdownMenuItem
|
||||
key="trash"
|
||||
route={route(`back.${model}.trash`)}
|
||||
icon={Views.ARCHIVATION.icon}
|
||||
trans={str(useTrans("back.archives")).ucFirst().value()}
|
||||
/>
|
||||
),
|
||||
]
|
||||
})
|
||||
},
|
||||
{
|
||||
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 && (
|
||||
<CustomDropdownMenuItem
|
||||
key="create"
|
||||
route={route(`back.${model}.create`)}
|
||||
/>
|
||||
),
|
||||
authPolicies.pageConfigs.viewTrash && (
|
||||
<CustomDropdownMenuItem
|
||||
key="trash"
|
||||
route={route(`back.${model}.trash`)}
|
||||
icon={Views.ARCHIVATION.icon}
|
||||
trans={str(useTrans("back.archives")).ucFirst().value()}
|
||||
/>
|
||||
),
|
||||
]})
|
||||
actions: (model: string) => filterActions({
|
||||
items: [
|
||||
authPolicies.pageConfigs.create && (
|
||||
<CustomDropdownMenuItem
|
||||
key="create"
|
||||
route={route(`back.${model}.create`)}
|
||||
/>
|
||||
),
|
||||
authPolicies.pageConfigs.viewTrash && (
|
||||
<CustomDropdownMenuItem
|
||||
key="trash"
|
||||
route={route(`back.${model}.trash`)}
|
||||
icon={Views.ARCHIVATION.icon}
|
||||
trans={str(useTrans("back.archives")).ucFirst().value()}
|
||||
/>
|
||||
),
|
||||
]
|
||||
})
|
||||
},
|
||||
{
|
||||
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 = (
|
||||
<SidebarMenuButton
|
||||
className={`${
|
||||
route().current(`back.${navLink.model}.*`)
|
||||
className={`${route().current(`back.${navLink.model}.*`)
|
||||
? "text-secondary-foreground"
|
||||
: "text-primary-foreground"
|
||||
}`}
|
||||
}`}
|
||||
asChild
|
||||
>
|
||||
{navLink.link ? (
|
||||
|
|
@ -275,11 +287,10 @@ export default function AppSidebar() {
|
|||
return (navLink.show && (
|
||||
<SidebarMenuItem
|
||||
key={navLink.title}
|
||||
className={`transition-colors rounded-md ${
|
||||
route().current(
|
||||
`back.${navLink.model}.*`,
|
||||
) ? "bg-secondary text-secondary-foreground" : "bg-opacity-0"
|
||||
}`}
|
||||
className={`transition-colors rounded-md ${route().current(
|
||||
`back.${navLink.model}.*`,
|
||||
) ? "bg-secondary text-secondary-foreground" : "bg-opacity-0"
|
||||
}`}
|
||||
>
|
||||
{isCollapsed ? (
|
||||
<Tooltip>
|
||||
|
|
@ -297,11 +308,10 @@ export default function AppSidebar() {
|
|||
<DropdownMenu>
|
||||
<DropdownMenuTrigger asChild>
|
||||
<SidebarMenuAction
|
||||
className={`${
|
||||
route().current(
|
||||
`back.${navLink.model}.*`,
|
||||
) ? "text-secondary-foreground" : ""
|
||||
} !top-0 !right-0 px-4 h-full`}
|
||||
className={`${route().current(
|
||||
`back.${navLink.model}.*`,
|
||||
) ? "text-secondary-foreground" : ""
|
||||
} !top-0 !right-0 px-4 h-full`}
|
||||
>
|
||||
<MoreHorizontal />
|
||||
</SidebarMenuAction>
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ export default function DataTable<TData, TValue>({
|
|||
columns: ColumnDef<TData, TValue>[];
|
||||
modelRoute: string;
|
||||
modelsPaginate: Resource;
|
||||
actions: Views;
|
||||
actions: Views | null;
|
||||
}) {
|
||||
const [sorting, setSorting] = useState<SortingState>([]);
|
||||
const data = modelsPaginate.data as TData[];
|
||||
|
|
@ -62,16 +62,18 @@ export default function DataTable<TData, TValue>({
|
|||
{header.isPlaceholder
|
||||
? null
|
||||
: flexRender(
|
||||
header.column.columnDef.header,
|
||||
header.column.columnDef
|
||||
.header,
|
||||
header.getContext(),
|
||||
)
|
||||
}
|
||||
)}
|
||||
</TableHead>
|
||||
);
|
||||
})}
|
||||
<TableHead>
|
||||
<DataTableFilterButton reset />
|
||||
</TableHead>
|
||||
{actions && (
|
||||
<TableHead>
|
||||
<DataTableFilterButton reset />
|
||||
</TableHead>
|
||||
)}
|
||||
</TableRow>
|
||||
))}
|
||||
</TableHeader>
|
||||
|
|
@ -93,16 +95,16 @@ export default function DataTable<TData, TValue>({
|
|||
)}
|
||||
</TableCell>
|
||||
))}
|
||||
<TableCell className="text-end">
|
||||
{actions.length > 0 && (
|
||||
{actions && (
|
||||
<TableCell className="text-end">
|
||||
<ModelActions
|
||||
actions={actions}
|
||||
modelRoute={modelRoute}
|
||||
model={row.original as Model}
|
||||
inDialog={true}
|
||||
/>
|
||||
)}
|
||||
</TableCell>
|
||||
</TableCell>
|
||||
)}
|
||||
</TableRow>
|
||||
))
|
||||
) : (
|
||||
|
|
|
|||
53
resources/ts/back/Pages/ContactCount/Index.tsx
Normal file
53
resources/ts/back/Pages/ContactCount/Index.tsx
Normal file
|
|
@ -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 } }) => (
|
||||
<p className="text-center">{str(useTrans(`validation.custom.contactCount.${column.id}`)).ucFirst().value()}</p>
|
||||
),
|
||||
cell: ({ row }: { row: Row<ContactCountModel> }) => {
|
||||
const type = Object.values(contactFormType).find(item => item.value === (row.getValue("type")));
|
||||
if(!type) return;
|
||||
return (<p className="text-muted-foreground italic m-0">{str(type.label).ucFirst().value()}</p>);
|
||||
}
|
||||
},
|
||||
{
|
||||
accessorKey: "submissions",
|
||||
header: ({ column }: { column: { id: string } }) => (
|
||||
<p className="text-center">{str(useTrans(`validation.custom.contactCount.${column.id}`)).ucFirst().value()}</p>
|
||||
),
|
||||
},
|
||||
];
|
||||
|
||||
const transModel = useTrans("models.classes.contact-count");
|
||||
const transTitle = str(transModel).ucFirst().value();
|
||||
return (
|
||||
<AuthenticatedLayout
|
||||
title={transTitle}
|
||||
>
|
||||
<DataTable
|
||||
columns={columns}
|
||||
modelRoute="contact-count"
|
||||
modelsPaginate={contactCountModels}
|
||||
/>
|
||||
</AuthenticatedLayout>
|
||||
);
|
||||
}
|
||||
8
resources/ts/back/types/global.d.ts
vendored
8
resources/ts/back/types/global.d.ts
vendored
|
|
@ -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<string, CommonPolicy>;
|
||||
|
|
|
|||
|
|
@ -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')
|
||||
);
|
||||
});
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue