Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@Raj100
Raj100 committed Apr 14, 2024
1 parent 14f436c commit 3b09273
Show file tree
Hide file tree
Showing 5 changed files with 161 additions and 80 deletions.
10 changes: 10 additions & 0 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"react-dom": "^18",
"react-firebase-hooks": "^5.1.1",
"react-redux": "^9.1.0",
"sweetalert2": "^11.10.7",
"swiper": "^11.1.0",
"swiper-react": "^1.0.0"
},
Expand Down
174 changes: 104 additions & 70 deletions src/app/Profile/page.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const Main = () => {
const [trades, setTrades] = useState([]);
const [leaderboards, setLeaderboards] = useState([]);
const [thisuserdata, setThisUserData] = useState([]);
const [loading, setLoading] = useState(true);

useEffect(() => {
const fetchData = async () => {
Expand Down Expand Up @@ -82,93 +83,126 @@ const Main = () => {
.select("*");
if (UserData) {
setLeaderboards(UserData);
setLoading(false);
} else {
console.log("error");
}
};
fetchData();
setLoading(false);
}, []);

return (
<>
<Navbar />
<div className={`grid grid-cols-1 lg:grid-cols-3 pt-32 w-full px-4 lg:px-24 gap-4`}>
<div className="flex">
<div className="w-20 h-20 border-white mx-3 my-3 rounded-full">
<Image src={Photo} alt="" width={80} height={80} />
</div>
<div className="">
<p className="p-2">Email: {userEmail}</p>
<p className="p-2">Balance: {zeta}</p>
</div>
</div>

<div className="grid cols-span-2 border rounded-lg p-2">
<h1 className="text-center">Leaderboards</h1>
{/* Render leaderboards data here */}
<div>
<div className="grid grid-cols-2">
<p>Name</p>
<p>Profits</p>
</div>
{leaderboards.map((leaderboard, index) => (
<div key={index} className="grid grid-cols-2">
<p>{leaderboard.Name}</p>
<p>{leaderboard.balance}</p>
{loading ? (
<h1>Loading...</h1>
) : (
<>
<div
className={`grid grid-cols-1 lg:grid-cols-3 pt-32 w-full px-4 lg:px-24 gap-4`}
>
<div className="flex">
<div className="w-20 h-20 border-white mx-3 my-3 rounded-full">
<Image src={Photo} alt="" width={80} height={80} />
</div>
<div className="">
<p className="p-2">Email: {userEmail}</p>
<p className="p-2">Balance: {zeta}</p>
</div>
))}
</div>
</div>
<div className="grid cols-span-2 border rounded-lg p-2">
<h1 className="center">Educational Leaderboards</h1>
<div className="grid grid-cols-2">
<p>Name</p>
<p>XP</p>
</div>
{leaderboards.map((leaderboard, index) => (
<div key={index} className="grid grid-cols-2">
<p>{leaderboard.Name}</p>
<p>{leaderboard.xp ? leaderboard.xp : "0"}</p>
</div>
))}
</div>
</div>

<div className="w-90 h-72 border-2 bg-red-400 mx-10 my-10 justify-center items-center">
<div>
<h3 className="text-center">batches</h3>
</div>
<div className="flex justify-center mt-5 px-5">
<div className="flex items-center">
<div className="w-32 h-32 mx-2">
<Image
src={batch_1}
alt=""
width={128}
height={128}
className={trades[0]?.badge1 ? "" : "invert"}
/>
{trades[0]?.badge1 ? "Acquired" : "Not Acquired"}
</div>
<div className="w-32 h-32 mx-2 ">
<Image src={batch_2} alt="" width={128} height={128} className={trades[0]?.badge2 ? "" : "invert"} />
{trades[0]?.badge2 ? "Acquired" : "Not Acquired "}
<div className="grid cols-span-2 border rounded-lg p-2">
<h1 className="text-center">Leaderboards</h1>
{/* Render leaderboards data here */}
<div>
<div className="grid grid-cols-2">
<p>Name</p>
<p>Profits</p>
</div>
{leaderboards.map((leaderboard, index) => (
<div key={index} className="grid grid-cols-2">
<p>{leaderboard.Name}</p>
<p>{leaderboard.balance}</p>
</div>
))}
</div>
</div>
<div className="w-32 h-32 mx-2">
<Image src={batch_3} alt="" width={128} height={128} className={trades[0]?.badge3 ? "" : "invert"} />
{trades[0]?.badge3 ? "Acquired" : "Not Acquired"}
<div className="grid cols-span-2 border rounded-lg p-2">
<h1 className="center">Educational Leaderboards</h1>
<div className="grid grid-cols-2">
<p>Name</p>
<p>XP</p>
</div>
{leaderboards.map((leaderboard, index) => (
<div key={index} className="grid grid-cols-2">
<p>{leaderboard.Name}</p>
<p>{leaderboard.xp ? leaderboard.xp : "0"}</p>
</div>
))}
</div>
<div className="w-32 h-32 mx-2">
<Image src={batch_4} alt="" width={128} height={128} className={trades[0]?.badge4 ? "" : "invert"} />
{trades[0]?.badge4 ? "Acquired" : "Not Acquired"}
</div>

<div className="w-90 h-72 border-2 bg-red-400 mx-10 my-10 justify-center items-center">
<div>
<h3 className="text-center">batches</h3>
</div>
<div className="w-32 h-32 mx-2">
<Image src={batch_5} alt="" width={128} height={128} className={trades[0]?.badge5 ? "" : "invert"} />
{trades[0]?.badge5 ? "Acquired" : "Not Acquired"}
<div className="flex justify-center mt-5 px-5">
<div className="flex items-center">
<div className="w-32 h-32 mx-2">
<Image
src={batch_1}
alt=""
width={128}
height={128}
className={trades[0]?.badge1 ? "" : "invert"}
/>
{trades[0]?.badge1 ? "Acquired" : "Not Acquired"}
</div>
<div className="w-32 h-32 mx-2 ">
<Image
src={batch_2}
alt=""
width={128}
height={128}
className={trades[0]?.badge2 ? "" : "invert"}
/>
{trades[0]?.badge2 ? "Acquired" : "Not Acquired "}
</div>
<div className="w-32 h-32 mx-2">
<Image
src={batch_3}
alt=""
width={128}
height={128}
className={trades[0]?.badge3 ? "" : "invert"}
/>
{trades[0]?.badge3 ? "Acquired" : "Not Acquired"}
</div>
<div className="w-32 h-32 mx-2">
<Image
src={batch_4}
alt=""
width={128}
height={128}
className={trades[0]?.badge4 ? "" : "invert"}
/>
{trades[0]?.badge4 ? "Acquired" : "Not Acquired"}
</div>
<div className="w-32 h-32 mx-2">
<Image
src={batch_5}
alt=""
width={128}
height={128}
className={trades[0]?.badge5 ? "" : "invert"}
/>
{trades[0]?.badge5 ? "Acquired" : "Not Acquired"}
</div>
</div>
</div>
</div>
</div>
</div>
</>
)}
<Footer />
</>
);
Expand Down
47 changes: 41 additions & 6 deletions src/app/VirtualTrading/Chart.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { AppContext } from "../../components/AppContext/AppContext";
import { useContext } from "react";
import supabase from "../supabase";
import JSConfetti from 'js-confetti'
import Swal from 'sweetalert2'


const Chart = () => {
Expand Down Expand Up @@ -146,14 +147,39 @@ const handleBuy = async () => {
if (updateError) {
throw updateError;
}
alert("Stock bought successfully!");
Swal.fire({
title: 'success!',
text: `Stock bought successfully! at price: ${quantity * currentPrice}`,
icon: 'success',
confirmButtonText: 'Cool'
})
} catch (tradeError) {
alert("Error buying stock");
Swal.fire({
title: 'Error!',
text: 'Error buying stock',
icon: 'error',
confirmButtonText: 'Cool'
})
console.error(error);
}
} else {
alert("Insufficient balance to buy stocks");
if(userEmail){
Swal.fire({
title: 'Error!',
text: 'Insufficient balance to buy stocks',
icon: 'warning',
confirmButtonText: 'Cool'
})
}
else{
Swal.fire({
title: 'Error!',
text: 'Please login to buy stocks',
icon: 'error',
confirmButtonText: 'Cool'
})
}
}
};

const handlesell = async (tradeId) => {
Expand Down Expand Up @@ -190,12 +216,21 @@ const handlesell = async (tradeId) => {
if (updateUserDataError) {
throw updateUserDataError;
}

alert("Stock sold successfully!");
Swal.fire({
title: 'Sucess!',
text: `Stock sold successfully! at price ${currentPrice}`,
icon: 'success',
confirmButtonText: 'Cool'
})
// jsConfetti.addConfetti();

} catch (tradeError) {
alert("Error selling stock");
Swal.fire({
title: 'Error!',
text: `Error selling stock at price ${currentPrice}`,
icon: 'error',
confirmButtonText: 'Cool'
})
console.error(error);
}

Expand Down
9 changes: 5 additions & 4 deletions src/components/Navbar/Navbar.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import CustomizedSwitches from "../modeswitch/modeswitch";
import { AppContext } from "../AppContext/AppContext";
import { useContext } from "react";
import Logo from "../../assets/logo.png";
import Swal from 'sweetalert2'

import Image from "next/image";
const Navbar = () => {
Expand Down Expand Up @@ -125,20 +126,20 @@ const [loading,setLoading]=useState(true);
<>
<div

className={`text-slate-600 p-2 hover:text-${theme}txt text-${theme}txt cursor-pointer relative`}
className={`p-2 hover:text-emerald-500 cursor-pointer relative`}
onMouseOver={()=>{setmenu2(1);}}
onMouseLeave={()=>{setmenu2(0);}}
>
{userEmail}
<ul className={` ${menu2?"absolute":"hidden"} bg-white text-black rounded-md pt-2 `}>
<Link href="/Profile" className="border-b p-4">Profile <i class="fa-solid fa-user"></i></Link>
<li onClick={logout} className="p-4">Logout <i class="fa-solid fa-arrow-right-from-bracket"></i></li>
<Link href="/Profile" className="border-b p-4 ">Profile <i class="fa-solid fa-user"></i></Link>
<li onClick={logout} className="p-4 cursor-pointer">Logout <i class="fa-solid fa-arrow-right-from-bracket"></i></li>
</ul>
</div>
</>
) : (
<div className="p-2 space-x-2 flex items-center justify-center">
<div className={`hover:text-${theme}txt`}>
<div className={`text-${theme}txt`}>
{<Link href="/Login">Login</Link>}
</div>
</div>
Expand Down

0 comments on commit 3b09273

Please sign in to comment.