Skip to content

S
sweepstake
Commit 28e5e706 by Arjun Jhukal
Options

updated the button label at update profile and add player form

parent f28e87e2
Showing with 30 additions and 23 deletions
src/app/(dashboard)/(user)/(outsideAuth)/buy-coins/[slug]/loading.tsx
// components/Loading.tsx
"use client";
import React from "react";
import LotifyLoading from "@/components/atom/LotifyLoading";
import GlobalLoading from "@/components/organism/GlobalLoading";
export default function Loading() {
......
src/app/(dashboard)/(user)/(privateUser)/account/AccountTab.tsx
......@@ -22,7 +22,7 @@ export default function AccountTab() {
const renderTabContent = () => {
switch (currentActiveTab) {
case "account_detail":
return <EditUserProfile id={user?.id as string | ""} />;
return <EditUserProfile id={user?.id as string | ""} buttonLabel="Update"/>;
case "wallet_information":
return <EditUserWallet />;
case "change_password":
......
src/components/molecules/TabController.tsx
......@@ -66,9 +66,9 @@ export default function TabController({
</Box>
{/* Mobile Tabs as Popper */}
<Box className="flex md:hidden">
<Box className="flex md:hidden mb-4">
<Button ref={anchorRef} onClick={handleToggle} color="primary" className="!justify-between !p-2 !border !border-solid !border-gray-600 !rounded-lg" endIcon={<ArrowDown2 size={20} />} >
<Typography>
<Typography className="flex gap-4">
{currentTabIcon}
{currentTabLabel}</Typography>
</Button>
......
src/components/organism/Header/Profile.tsx
......@@ -5,7 +5,7 @@ import { PATH } from '@/routes/PATH';
import { clearTokens } from '@/slice/authSlice';
import { Box, Button, ButtonBase, ClickAwayListener, Fade, List, ListItem, ListItemButton, ListItemIcon, ListItemText, Paper, Popper, Stack, Typography } from '@mui/material'
import Link from 'next/link';
import { useRouter } from 'next/navigation';
import { usePathname, useRouter, useSearchParams } from 'next/navigation';
import React, { useRef, useState } from 'react'
const avataur1 = '/assets/images/avatar-6.png';
import { ArrowDown2, ArrowUp2, Coin, Logout, MoneySend, Profile, Wallet2 } from "@wandersonalwes/iconsax-react";
......@@ -17,6 +17,8 @@ export default function ProfileBlock() {
const handleToggle = () => {
setOpen((prevOpen) => !prevOpen);
};
const pathname = usePathname();
const search = useSearchParams();
const dispatch = useAppDispatch();
const router = useRouter();
const user = useAppSelector((state) => state?.auth.user);
......@@ -28,6 +30,10 @@ export default function ProfileBlock() {
};
const id = open ? 'profile-dropdown' : ""
React.useEffect(() => {
setOpen(false);
}, [pathname, search])
const handleLogout = (e: React.MouseEvent) => {
router.replace(PATH.AUTH.LOGIN.ROOT);
e.preventDefault();
......@@ -236,21 +242,22 @@ export default function ProfileBlock() {
zIndex: 2,
padding: 0,
}}>
{!item?.onClick ? <Link
href={item.href || ""}
className={`flex items-center py-3 px-4 `}
>
<ListItemIcon className="min-w-[30px] mr-1 group-hover:text-primary">{item.icon}</ListItemIcon>
<ListItemText primary={item.label} className='group-hover:text-primary' />
</Link> : <ListItemButton
href={item.href || ""}
onClick={item.onClick}
className={`flex items-center py-3 px-4 !wit`}
>
<ListItemIcon className="min-w-[30px] mr-1 group-hover:text-primary">{item.icon}</ListItemIcon>
<ListItemText primary={item.label} className='group-hover:text-primary' />
</ListItemButton>}
{!item?.onClick ?
<Link
href={item.href || ""}
className={`flex items-center py-3 px-4 `}
>
<ListItemIcon className="min-w-[30px] mr-1 group-hover:text-primary">{item.icon}</ListItemIcon>
<ListItemText primary={item.label} className='group-hover:text-primary' />
</Link> :
<ListItemButton
href={item.href || ""}
onClick={item.onClick}
className={`flex items-center py-3 px-4 !wit`}
>
<ListItemIcon className="min-w-[30px] mr-1 group-hover:text-primary">{item.icon}</ListItemIcon>
<ListItemText primary={item.label} className='group-hover:text-primary' />
</ListItemButton>}
</ListItem>
))}
</List>
......
src/components/pages/dashboard/adminDashboard/players/addPlayerForm/AddPlayerForm.tsx
......@@ -7,7 +7,7 @@ import { FormikProps } from 'formik'
import { useRouter } from 'next/navigation'
import React from 'react'
export default function AddPlayerForm({ formik, id, data, loading }: { formik: FormikProps<PlayerProps>, id?: string, data?: SinlgePlayerResponseProps, loading?: boolean }) {
export default function AddPlayerForm({ formik, id, data, loading, buttonLabel }: { formik: FormikProps<PlayerProps>, id?: string, data?: SinlgePlayerResponseProps, loading?: boolean, buttonLabel?: string }) {
const router = useRouter();
console.log(loading)
......@@ -187,7 +187,7 @@ export default function AddPlayerForm({ formik, id, data, loading }: { formik: F
router.push(PATH.ADMIN.PLAYERS.ROOT)
}}>Cancel Player Edit</Button> : null} */}
<Button type="submit" variant="contained" color="primary" sx={{ color: "#fff" }} >
{!loading ? `Confirm ${id ? "Player Update" : "Player Addition"}` : "Updating"}
{!loading ? `${buttonLabel ? buttonLabel : `Confirm ${id ? "Player Update" : "Player Addition"}`}` : "Updating"}
</Button>
</div>
</form>
......
src/components/pages/dashboard/userDashboard/account/profile/editProfile/index.tsx
......@@ -10,7 +10,7 @@ import { useFormik } from 'formik';
import { useRouter } from 'next/navigation';
import React from 'react'
export default function EditUserProfile({ id }: { id: string }) {
export default function EditUserProfile({ id, buttonLabel }: { id: string, buttonLabel?: string; }) {
const dispatch = useAppDispatch();
const router = useRouter();
......@@ -115,6 +115,7 @@ export default function EditUserProfile({ id }: { id: string }) {
data={formattedData}
id={id}
loading={isLoading}
buttonLabel={buttonLabel}
/>
)
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment