Skip to content

Commit f1225f6

Browse files
akarsh911akarsh911
committed
fix: update type casting for event document updates to use UpdateData for better type safety
1 parent a17d037 commit f1225f6

2 files changed

Lines changed: 16 additions & 63 deletions

File tree

‎src/component/Sidebar.tsx‎

Lines changed: 14 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -178,17 +178,11 @@ const Sidebar: React.FC = () => {
178178
{!isCollapsed && <span className="ms-3">Accommodation</span>}
179179
</NavLink>
180180
</Tooltip>
181-
182-
<Tooltip text="Coupons" show={isCollapsed && hoveredItem === 'coupons'}>
181+
182+
<Tooltip text="Coupons" show={isCollapsed && hoveredItem === 'coupons'}>
183183
<NavLink
184184
to="/coupons"
185-
className={({ isActive }) =>
186-
`nav-link d-flex align-items-center ${isCollapsed ? 'justify-content-center' : ''} px-4 py-3 mb-1 rounded mx-2 ${
187-
isActive
188-
? "active fw-bold text-primary bg-primary bg-opacity-10 border-start border-primary border-4"
189-
: "text-dark hover-bg-light"
190-
}`
191-
}
185+
className={({ isActive }) => getNavLinkClasses(isActive)}
192186
style={{ textDecoration: 'none', transition: 'all 0.2s ease' }}
193187
onMouseEnter={() => setHoveredItem('coupons')}
194188
onMouseLeave={() => setHoveredItem(null)}
@@ -197,17 +191,12 @@ const Sidebar: React.FC = () => {
197191
{!isCollapsed && <span className="ms-3">Coupons</span>}
198192
</NavLink>
199193
</Tooltip>
200-
194+
195+
201196
<Tooltip text="Venues" show={isCollapsed && hoveredItem === 'venues'}>
202197
<NavLink
203198
to="/venue"
204-
className={({ isActive }) =>
205-
`nav-link d-flex align-items-center ${isCollapsed ? 'justify-content-center' : ''} px-4 py-3 mb-1 rounded mx-2 ${
206-
isActive
207-
? "active fw-bold text-primary bg-primary bg-opacity-10 border-start border-primary border-4"
208-
: "text-dark hover-bg-light"
209-
}`
210-
}
199+
className={({ isActive }) => getNavLinkClasses(isActive)}
211200
style={{ textDecoration: 'none', transition: 'all 0.2s ease' }}
212201
onMouseEnter={() => setHoveredItem('venues')}
213202
onMouseLeave={() => setHoveredItem(null)}
@@ -220,13 +209,7 @@ const Sidebar: React.FC = () => {
220209
<Tooltip text="Colleges" show={isCollapsed && hoveredItem === 'colleges'}>
221210
<NavLink
222211
to="/colleges"
223-
className={({ isActive }) =>
224-
`nav-link d-flex align-items-center ${isCollapsed ? 'justify-content-center' : ''} px-4 py-3 mb-1 rounded mx-2 ${
225-
isActive
226-
? "active fw-bold text-primary bg-primary bg-opacity-10 border-start border-primary border-4"
227-
: "text-dark hover-bg-light"
228-
}`
229-
}
212+
className={({ isActive }) => getNavLinkClasses(isActive)}
230213
style={{ textDecoration: 'none', transition: 'all 0.2s ease' }}
231214
onMouseEnter={() => setHoveredItem('colleges')}
232215
onMouseLeave={() => setHoveredItem(null)}
@@ -239,13 +222,7 @@ const Sidebar: React.FC = () => {
239222
<Tooltip text="Users" show={isCollapsed && hoveredItem === 'users'}>
240223
<NavLink
241224
to="/users"
242-
className={({ isActive }) =>
243-
`nav-link d-flex align-items-center ${isCollapsed ? 'justify-content-center' : ''} px-4 py-3 mb-1 rounded mx-2 ${
244-
isActive
245-
? "active fw-bold text-primary bg-primary bg-opacity-10 border-start border-primary border-4"
246-
: "text-dark hover-bg-light"
247-
}`
248-
}
225+
className={({ isActive }) => getNavLinkClasses(isActive)}
249226
style={{ textDecoration: 'none', transition: 'all 0.2s ease' }}
250227
onMouseEnter={() => setHoveredItem('users')}
251228
onMouseLeave={() => setHoveredItem(null)}
@@ -258,15 +235,9 @@ const Sidebar: React.FC = () => {
258235
<Tooltip text="Bills" show={isCollapsed && hoveredItem === 'bills'}>
259236
<NavLink
260237
to="/bills"
261-
className={({ isActive }) =>
262-
`nav-link d-flex align-items-center ${isCollapsed ? 'justify-content-center' : ''} px-4 py-3 mb-1 rounded mx-2 ${
263-
isActive
264-
? "active fw-bold text-primary bg-primary bg-opacity-10 border-start border-primary border-4"
265-
: "text-dark hover-bg-light"
266-
}`
267-
}
238+
className={({ isActive }) => getNavLinkClasses(isActive)}
268239
style={{ textDecoration: 'none', transition: 'all 0.2s ease' }}
269-
onMouseEnter={() => setHoveredItem('bills')}
240+
onMouseEnter={() => setHoveredItem('bills')}
270241
onMouseLeave={() => setHoveredItem(null)}
271242
>
272243
<BsReceipt size={ICON_SIZE} />
@@ -277,13 +248,7 @@ const Sidebar: React.FC = () => {
277248
<Tooltip text="Transactions" show={isCollapsed && hoveredItem === 'transactions'}>
278249
<NavLink
279250
to="/transactions"
280-
className={({ isActive }) =>
281-
`nav-link d-flex align-items-center ${isCollapsed ? 'justify-content-center' : ''} px-4 py-3 mb-1 rounded mx-2 ${
282-
isActive
283-
? "active fw-bold text-primary bg-primary bg-opacity-10 border-start border-primary border-4"
284-
: "text-dark hover-bg-light"
285-
}`
286-
}
251+
className={({ isActive }) => getNavLinkClasses(isActive)}
287252
style={{ textDecoration: 'none', transition: 'all 0.2s ease' }}
288253
onMouseEnter={() => setHoveredItem('transactions')}
289254
onMouseLeave={() => setHoveredItem(null)}
@@ -296,15 +261,9 @@ const Sidebar: React.FC = () => {
296261
<Tooltip text="Ambassador Applications" show={isCollapsed && hoveredItem === 'ambassador'}>
297262
<NavLink
298263
to="/ambassador-applications"
299-
className={({ isActive }) =>
300-
`nav-link d-flex align-items-center ${isCollapsed ? 'justify-content-center' : ''} px-4 py-3 mb-1 rounded mx-2 ${
301-
isActive
302-
? "active fw-bold text-primary bg-primary bg-opacity-10 border-start border-primary border-4"
303-
: "text-dark hover-bg-light"
304-
}`
305-
}
264+
className={({ isActive }) => getNavLinkClasses(isActive)}
306265
style={{ textDecoration: 'none', transition: 'all 0.2s ease' }}
307-
onMouseEnter={() => setHoveredItem('ambassador')}
266+
onMouseEnter={() => setHoveredItem('ambassador')}
308267
onMouseLeave={() => setHoveredItem(null)}
309268
>
310269
<BsPersonCheck size={ICON_SIZE} />
@@ -315,13 +274,7 @@ const Sidebar: React.FC = () => {
315274
<Tooltip text="Banners" show={isCollapsed && hoveredItem === 'banners'}>
316275
<NavLink
317276
to="/banners"
318-
className={({ isActive }) =>
319-
`nav-link d-flex align-items-center ${isCollapsed ? 'justify-content-center' : ''} px-4 py-3 mb-1 rounded mx-2 ${
320-
isActive
321-
? "active fw-bold text-primary bg-primary bg-opacity-10 border-start border-primary border-4"
322-
: "text-dark hover-bg-light"
323-
}`
324-
}
277+
className={({ isActive }) => getNavLinkClasses(isActive)}
325278
style={{ textDecoration: 'none', transition: 'all 0.2s ease' }}
326279
onMouseEnter={() => setHoveredItem('banners')}
327280
onMouseLeave={() => setHoveredItem(null)}

‎src/contexts/ThemeContext.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ export const ThemeProvider: React.FC<ThemeProviderProps> = ({ children }) => {
3535
return savedTheme === 'dark';
3636
}
3737

38-
// Default to system preference
39-
return window.matchMedia('(prefers-color-scheme: dark)').matches;
38+
// Default to light mode instead of system preference
39+
return false;
4040
} catch {
4141
// Fallback to light mode if there's any error
4242
return false;

0 commit comments

Comments
 (0)