Skip to content

Chore/cca 2526 s1 #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juancarlovieri merged 2 commits into from
Oct 2, 2025
Merged

Chore/cca 2526 s1 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ea4425
Changes to navbar
juancarlovieri Aug 11, 2025
f35d71b
Update profile page
juancarlovieri Aug 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 25 additions & 3 deletions src/app/components/NavBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export default function NavBar() {
<span>Profile</span>
</Link>
</li>
<li className="hover:translate-x-1">
{/* <li className="hover:translate-x-1">
<Link
className="flex items-center gap-3 py-2"
href="/dashboard/instructions"
Expand All @@ -133,8 +133,8 @@ export default function NavBar() {
</svg>
<span>Instructions</span>
</Link>
</li>
<li className="hover:translate-x-1">
</li> */}
{/* <li className="hover:translate-x-1">
<Link
className="flex items-center gap-3 py-2"
href="/dashboard/roomBidding"
Expand All @@ -158,6 +158,28 @@ export default function NavBar() {
</svg>
<span>Room Bidding</span>
</Link>
</li> */}
<li className="hover:translate-x-1">
<Link className="flex items-center gap-3 py-2" href="/dashboard/ccas">
<svg
className="h-5 w-5"
fill="none"
height="24"
stroke="currentColor"
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
viewBox="0 0 24 24"
width="24"
xmlns="http://www.w3.org/2000/svg"
>
<rect x="3" y="2" width="14" height="20" />
<line x1="3" y1="7" x2="17" y2="7" />
<line x1="3" y1="11" x2="17" y2="11" />
<line x1="3" y1="15" x2="17" y2="15" />
</svg>
<span>CCA Signup</span>
</Link>
</li>
<li className="hover:translate-x-1">
<Link
Expand Down
30 changes: 20 additions & 10 deletions src/app/dashboard/profile/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ const ProfilePage = () => {

const [isClient, setIsClient] = useState(false);
const [roomBidInfo, setRoomBidInfo] = useState<RoomInfoType>();
const [ccaPoints, setCcaPoints] = useState<{ cca: string; points: number }[]>([]);
const [ccaPoints, setCcaPoints] = useState<{ cca: string; points: number }[]>(
[]
);
const [easterEgg, setEasterEgg] = useState(false);
const [isLoading, setIsLoading] = useState(true); // New loading flag

Expand All @@ -39,7 +41,9 @@ const ProfilePage = () => {
const fetchRoomBidInfo = async () => {
try {
setIsLoading(true); // Set loading to true when fetch starts
const response = await axios.get(`${process.env.NEXT_PUBLIC_BACKEND_URL}/room/info`);
const response = await axios.get(
`${process.env.NEXT_PUBLIC_BACKEND_URL}/room/info`
);
if (response.data.success) {
const roomBidInfo: RoomInfoType = {
isEligible: response.data.data.info.isEligible,
Expand Down Expand Up @@ -102,11 +106,13 @@ const ProfilePage = () => {
<h1 className="text-2xl sm:text-3xl font-semibold text-gray-800">
{user.username} {isSuperhero && "✨"}
</h1>
<p className="text-gray-500">Year {user.year}</p>
{/* <p className="text-gray-500">Year {user.year}</p> */}
<p className="text-gray-500">Gender: {user.gender}</p>
<p className="text-gray-500">Room: {user.room}</p>
<div className="mt-2 flex flex-wrap gap-2 justify-center sm:justify-start">
<span className="px-3 py-1 bg-gray-200 text-gray-700 rounded-full text-sm">
{/* <span className="px-3 py-1 bg-gray-200 text-gray-700 rounded-full text-sm">
Points: {roomBidInfo?.points || "Loading..."}
</span>
</span> */}
{isSuperhero && (
<span className="px-3 py-1 bg-gray-200 text-gray-700 rounded-full text-sm">
Star Status
Expand All @@ -123,12 +129,14 @@ const ProfilePage = () => {
</div>

{/* CCA Points Distribution */}
<div className="bg-white rounded-lg shadow-sm p-6 animate-slide-up">
{/* <div className="bg-white rounded-lg shadow-sm p-6 animate-slide-up">
<h2 className="text-xl sm:text-2xl font-semibold text-gray-800 mb-6 text-center">
Your Activities
</h2>
{isLoading ? (
<p className="text-gray-500 text-center">Loading your activities...</p>
<p className="text-gray-500 text-center">
Loading your activities...
</p>
) : ccaPoints.length > 0 ? (
<div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4 max-h-96 overflow-y-auto">
{ccaPoints
Expand All @@ -139,7 +147,9 @@ const ProfilePage = () => {
className="group bg-gray-50 p-4 rounded-lg shadow-sm hover:shadow-md transition-all duration-300 transform hover:-translate-y-1"
>
<div className="flex justify-between items-center">
<span className="text-gray-700 font-medium truncate">{cca.cca}</span>
<span className="text-gray-700 font-medium truncate">
{cca.cca}
</span>
<div className="relative">
<div className="w-10 h-10 bg-gray-200 rounded-full flex items-center justify-center text-gray-600 font-semibold shadow-sm group-hover:animate-pulse">
{cca.points}
Expand All @@ -160,7 +170,7 @@ const ProfilePage = () => {
Shining bright like a star! 🌟
</p>
)}
</div>
</div> */}
</div>

{/* Hidden Bunny Easter Egg */}
Expand Down Expand Up @@ -206,4 +216,4 @@ const customStyles = `
50% { transform: rotate(3deg); }
100% { transform: rotate(-3deg); }
}
`;
`;