Skip to content

Commit d3955b2

Browse files
forkanimahdiforkanimahdi
authored
Merge pull request #12 from aymanboujjar/main
fixing the test errors
2 parents 8d154a8 + 6590e61 commit d3955b2

86 files changed

Lines changed: 2485 additions & 1416 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎resources/css/app.css‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,17 @@
109109
--sidebar-foreground: var(--color-twhite);
110110
--sidebar-primary: var(--color-beta-blue);
111111
--sidebar-primary-foreground: var(--color-twhite);
112-
--sidebar-accent: color-mix(in srgb, var(--color-twhite) 9%, var(--color-tblack));
112+
--sidebar-accent: color-mix(
113+
in srgb,
114+
var(--color-twhite) 9%,
115+
var(--color-tblack)
116+
);
113117
--sidebar-accent-foreground: var(--color-twhite);
114-
--sidebar-border: color-mix(in srgb, var(--color-twhite) 12%, var(--color-tblack));
118+
--sidebar-border: color-mix(
119+
in srgb,
120+
var(--color-twhite) 12%,
121+
var(--color-tblack)
122+
);
115123
--sidebar-ring: var(--color-beta-blue);
116124
}
117125

‎resources/js/components/Footer.jsx‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,12 @@ const platformLinks = [
3434
const initiativesLinks = [
3535
{ en: 'Tililab', fr: 'Tililab', ar: 'تيليلاب', href: '/tililab' },
3636
{ en: 'Tilila', fr: 'Tilila', ar: 'تيليلا', href: '/tilila' },
37-
{ en: 'Opportunities', fr: 'Opportunités', ar: 'الفرص', href: '/opportunities' },
37+
{
38+
en: 'Opportunities',
39+
fr: 'Opportunités',
40+
ar: 'الفرص',
41+
href: '/opportunities',
42+
},
3843
];
3944

4045
export default function Footer() {

‎resources/js/components/Navbar.jsx‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,7 @@ export default function Navbar() {
150150
: 'text-tgray hover:text-tblack',
151151
].join(' ')}
152152
>
153-
<TransText
154-
en={item.en}
155-
fr={item.fr}
156-
ar={item.ar}
157-
/>
153+
<TransText en={item.en} fr={item.fr} ar={item.ar} />
158154
{isActiveHref(item.href) ? (
159155
<span
160156
aria-hidden="true"

‎resources/js/components/app-sidebar.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ const moduleItems: NavItem[] = [
6969
},
7070
{
7171
title: 'Events',
72-
href: "/admin/events",
72+
href: '/admin/events',
7373
icon: Calendar,
7474
},
7575
// {
@@ -131,18 +131,18 @@ export function AppSidebar() {
131131
prefetch
132132
className="flex items-start gap-3 rounded-lg outline-none focus-visible:ring-2 focus-visible:ring-sidebar-ring"
133133
>
134-
<span className="bg-beta-blue/20 flex size-10 shrink-0 items-center justify-center rounded-lg">
134+
<span className="flex size-10 shrink-0 items-center justify-center rounded-lg bg-beta-blue/20">
135135
<img
136136
src="/assets/logo.webp"
137137
alt=""
138138
className="size-7 object-contain"
139139
/>
140140
</span>
141-
<span className="group-data-[collapsible=icon]:hidden grid min-w-0 flex-1 text-left leading-tight">
142-
<span className="text-twhite truncate text-sm font-bold tracking-tight">
141+
<span className="grid min-w-0 flex-1 text-left leading-tight group-data-[collapsible=icon]:hidden">
142+
<span className="truncate text-sm font-bold tracking-tight text-twhite">
143143
TILILA Impact
144144
</span>
145-
<span className="text-sidebar-foreground/60 mt-0.5 truncate text-xs font-medium">
145+
<span className="mt-0.5 truncate text-xs font-medium text-sidebar-foreground/60">
146146
Strategic Pilotage
147147
</span>
148148
</span>

‎resources/js/components/auth-sidebar.tsx‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,10 @@ export function AuthSidebar() {
5858

5959
return (
6060
<SidebarMenuItem key={item.title}>
61-
<SidebarMenuButton asChild tooltip={{ children: item.title }}>
61+
<SidebarMenuButton
62+
asChild
63+
tooltip={{ children: item.title }}
64+
>
6265
<Link href={item.href} prefetch>
6366
{Icon && <Icon />}
6467
<span>{item.title}</span>
@@ -71,8 +74,10 @@ export function AuthSidebar() {
7174
</SidebarGroup>
7275
</SidebarContent>
7376

74-
<SidebarFooter className="text-sidebar-foreground/70 p-4 text-xs">
75-
<p className="leading-snug">Secure access to your Tilila account.</p>
77+
<SidebarFooter className="p-4 text-xs text-sidebar-foreground/70">
78+
<p className="leading-snug">
79+
Secure access to your Tilila account.
80+
</p>
7681
</SidebarFooter>
7782
</Sidebar>
7883
);

‎resources/js/components/user-info.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,23 +45,23 @@ export function UserInfo({
4545
<span
4646
className={
4747
isSidebar
48-
? 'text-twhite truncate font-medium'
48+
? 'truncate font-medium text-twhite'
4949
: 'truncate font-medium'
5050
}
5151
>
5252
{user.name}
5353
</span>
5454
{isSidebar && roleLabel ? (
55-
<span className="text-sidebar-foreground/60 truncate text-xs">
55+
<span className="truncate text-xs text-sidebar-foreground/60">
5656
{roleLabel}
5757
</span>
5858
) : null}
5959
{showEmail && (
6060
<span
6161
className={
6262
isSidebar
63-
? 'text-sidebar-foreground/70 truncate text-xs'
64-
: 'text-muted-foreground truncate text-xs'
63+
? 'truncate text-xs text-sidebar-foreground/70'
64+
: 'truncate text-xs text-muted-foreground'
6565
}
6666
>
6767
{user.email}

‎resources/js/contexts/TranslationContext.jsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,9 @@ export function TranslationProvider({ children }) {
8888
export function useTranslation() {
8989
const contextValue = useContext(TranslationContext);
9090
if (!contextValue) {
91-
throw new Error('useTranslation must be used within TranslationProvider');
91+
throw new Error(
92+
'useTranslation must be used within TranslationProvider',
93+
);
9294
}
9395
return contextValue;
9496
}
95-

‎resources/js/layouts/app/app-sidebar-layout.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export default function AppSidebarLayout({ children }: AppLayoutProps) {
1717
className="overflow-x-hidden"
1818
>
1919
{isAuthenticated && (
20-
<div className="border-border/60 flex h-12 shrink-0 items-center border-b bg-muted px-3 lg:hidden">
20+
<div className="flex h-12 shrink-0 items-center border-b border-border/60 bg-muted px-3 lg:hidden">
2121
<SidebarTrigger className="-ml-1" />
2222
</div>
2323
)}

‎resources/js/layouts/auth/auth-sidebar-layout.tsx‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ export default function AuthSidebarLayout({
1414
return (
1515
<AppShell variant="sidebar">
1616
<AuthSidebar />
17-
<AppContent variant="sidebar" className="bg-beta-white overflow-x-hidden">
17+
<AppContent
18+
variant="sidebar"
19+
className="overflow-x-hidden bg-beta-white"
20+
>
1821
<header className="flex h-14 shrink-0 items-center gap-2 border-b border-sidebar-border/50 px-4 lg:hidden">
1922
<SidebarTrigger className="-ml-1" />
2023
</header>
@@ -23,12 +26,12 @@ export default function AuthSidebarLayout({
2326
{(title || description) && (
2427
<div className="text-center">
2528
{title ? (
26-
<h1 className="text-tblack text-2xl font-semibold tracking-tight">
29+
<h1 className="text-2xl font-semibold tracking-tight text-tblack">
2730
{title}
2831
</h1>
2932
) : null}
3033
{description ? (
31-
<p className="text-tgray mt-2 text-sm leading-relaxed">
34+
<p className="mt-2 text-sm leading-relaxed text-tgray">
3235
{description}
3336
</p>
3437
) : null}

‎resources/js/layouts/auth/auth-simple-layout.tsx‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ export default function AuthSimpleLayout({
1010
return (
1111
<div className="relative min-h-svh overflow-hidden bg-beta-white">
1212
<div className="absolute inset-0 bg-[radial-gradient(circle_at_top_left,rgba(0,151,170,0.12),transparent_38%),radial-gradient(circle_at_bottom_right,rgba(15,23,42,0.06),transparent_34%)]" />
13-
<div className="absolute -right-24 top-20 h-72 w-72 rounded-full bg-alpha-blue/70 blur-3xl" />
14-
<div className="absolute -left-24 bottom-0 h-72 w-72 rounded-full bg-secondary/20 blur-3xl" />
13+
<div className="absolute top-20 -right-24 h-72 w-72 rounded-full bg-alpha-blue/70 blur-3xl" />
14+
<div className="absolute bottom-0 -left-24 h-72 w-72 rounded-full bg-secondary/20 blur-3xl" />
1515

1616
<div className="relative mx-auto grid min-h-svh max-w-7xl lg:grid-cols-[1.1fr_0.9fr]">
1717
<div className="hidden flex-col justify-between px-6 py-8 lg:flex lg:px-8 xl:px-12">
@@ -38,7 +38,7 @@ export default function AuthSimpleLayout({
3838

3939
<div className="mt-10 grid gap-4 sm:grid-cols-3">
4040
<div className="rounded-2xl border border-border bg-background/90 p-4 shadow-sm backdrop-blur">
41-
<div className="text-xs font-semibold uppercase tracking-[0.25em] text-tgray">
41+
<div className="text-xs font-semibold tracking-[0.25em] text-tgray uppercase">
4242
Secure access
4343
</div>
4444
<p className="mt-2 text-sm leading-6 text-tblack">
@@ -47,7 +47,7 @@ export default function AuthSimpleLayout({
4747
</p>
4848
</div>
4949
<div className="rounded-2xl border border-border bg-background/90 p-4 shadow-sm backdrop-blur">
50-
<div className="text-xs font-semibold uppercase tracking-[0.25em] text-tgray">
50+
<div className="text-xs font-semibold tracking-[0.25em] text-tgray uppercase">
5151
Fast response
5252
</div>
5353
<p className="mt-2 text-sm leading-6 text-tblack">
@@ -56,7 +56,7 @@ export default function AuthSimpleLayout({
5656
</p>
5757
</div>
5858
<div className="rounded-2xl border border-border bg-background/90 p-4 shadow-sm backdrop-blur">
59-
<div className="text-xs font-semibold uppercase tracking-[0.25em] text-tgray">
59+
<div className="text-xs font-semibold tracking-[0.25em] text-tgray uppercase">
6060
One platform
6161
</div>
6262
<p className="mt-2 text-sm leading-6 text-tblack">
@@ -81,7 +81,10 @@ export default function AuthSimpleLayout({
8181
<div className="flex items-center justify-center px-4 py-8 sm:px-6 lg:px-8 xl:px-12">
8282
<div className="w-full max-w-md rounded-3xl border border-border bg-background p-6 shadow-sm sm:p-8 lg:max-w-xl lg:p-10">
8383
<div className="mb-8 flex flex-col items-center gap-4 text-center lg:hidden">
84-
<Link href={home()} className="inline-flex items-center">
84+
<Link
85+
href={home()}
86+
className="inline-flex items-center"
87+
>
8588
<img
8689
src="/assets/logo.webp"
8790
alt="Tilila"

0 commit comments

Comments
 (0)