Merge branch 'main' into main

Author: ac-mmi

package-lock.json

@@ -18,20 +18,19 @@
     "format:check": "prettier --check 'src/**/*.{js,jsx,ts,tsx,json,css,md}'"
   },
   "dependencies": {
-    "@tailwindcss/vite": "^4.1.10",
-    "@types/dompurify": "^3.0.5",
-    "axios": "^1.9.0",
+    "@tailwindcss/vite": "^4.1.11",
+    "axios": "^1.10.0",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "dompurify": "^3.2.6",
-    "framer-motion": "^12.17.3",
+    "framer-motion": "^12.23.0",
     "hastscript": "^9.0.1",
-    "lucide-react": "^0.476.0",
+    "lucide-react": "^0.525.0",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
     "react-markdown": "^10.1.0",
     "react-responsive-carousel": "^3.2.23",
-    "react-router-dom": "^7.6.2",
+    "react-router-dom": "^7.6.3",
     "rehype-autolink-headings": "^7.1.0",
     "rehype-raw": "^7.0.0",
     "rehype-sanitize": "^6.0.0",
@@ -40,29 +39,29 @@
     "remark-gfm": "^4.0.1",
     "remark-supersub": "^1.0.0",
     "tailwind-merge": "^3.3.1",
-    "tailwindcss": "^4.0.4",
+    "tailwindcss": "^4.1.11",
     "tailwindcss-animate": "^1.0.7",
     "unist-util-visit": "^5.0.0"
   },
   "devDependencies": {
-    "@eslint/js": "^9.19.0",
-    "@types/node": "^22.15.31",
+    "@eslint/js": "^9.30.1",
+    "@types/node": "^24.0.10",
     "@types/react": "^19.1.8",
     "@types/react-dom": "^19.1.6",
-    "@vitejs/plugin-react": "^1.3.2",
-    "eslint": "^9.28.0",
+    "@vitejs/plugin-react": "^4.6.0",
+    "eslint": "^9.30.1",
     "eslint-config-prettier": "^10.1.5",
-    "eslint-plugin-prettier": "^5.4.1",
+    "eslint-plugin-prettier": "^5.5.1",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-react-refresh": "^0.4.20",
     "gh-pages": "^6.3.0",
-    "globals": "^15.15.0",
-    "markdownlint": "^0.37.4",
-    "markdownlint-cli": "^0.44.0",
-    "prettier": "^3.5.3",
-    "typescript": "~5.7.2",
-    "typescript-eslint": "^8.34.0",
-    "vite": "^6.3.5"
+    "globals": "^16.3.0",
+    "markdownlint": "^0.38.0",
+    "markdownlint-cli": "^0.45.0",
+    "prettier": "^3.6.2",
+    "typescript": "~5.8.3",
+    "typescript-eslint": "^8.36.0",
+    "vite": "^7.0.2"
   }
 }

package.json

@@ -186,7 +186,7 @@ const ProjectsSection = () => {
             {!showAllProjects ? (
               <button
                 onClick={() => setShowAllProjects(true)}
-                className="px-8 py-3 bg-blue-600 hover:bg-red-600 text-white rounded-lg shadow-sm font-medium transition-all duration-300 inline-flex items-center gap-2"
+                className="px-8 py-3 bg-blue-600 hover:bg-red-600 cursor-pointer text-white rounded-lg shadow-sm font-medium transition-all duration-300 inline-flex items-center gap-2"
               >
                 Show more
                 <svg

public/assets/Images/aman-naik-week4-img1.png

@@ -48,7 +48,7 @@ const Donation: React.FC = () => {
           {/* Donate Now Button */}
           <motion.button
             onClick={handleDonateClick}
-            className="mt-6 px-6 py-3 bg-[#fbd04d] text-black text-2xl font-bold rounded-full shadow-md hover:bg-yellow-500 transition duration-300 uppercase"
+            className="mt-6 px-6 py-3 bg-[#fbd04d] text-black text-2xl font-bold rounded-full shadow-md hover:bg-yellow-500 cursor-pointer transition duration-300 uppercase"
             variants={bounce}
             whileHover="hover"
             whileTap="tap"
@@ -72,25 +72,24 @@ const Donation: React.FC = () => {
 
       {/* Newsletter and Volunteer Section*/}
       <div className="relative z-10 w-full mt-12 text-center">
-        <Link to="/volunteer">
-          <motion.div
-            className="flex justify-center items-center"
-            variants={slideInBottom}
-            initial="hidden"
-            whileInView="visible"
-            viewport={{ once: true, amount: 0.6 }}
-          >
-            <div className="relative">
-              <motion.div
-                className="absolute -top-8 -right-8"
-                animate={{
-                  x: [0, 10, 0],
-                  transition: { repeat: Infinity, duration: 1.5 },
-                }}
-              >
-                <i className="fas fa-arrow-right text-2xl" />
-              </motion.div>
-
+        <motion.div
+          className="flex justify-center items-center"
+          variants={slideInBottom}
+          initial="hidden"
+          whileInView="visible"
+          viewport={{ once: true, amount: 0.6 }}
+        >
+          <div className="relative">
+            <motion.div
+              className="absolute -top-8 -right-8"
+              animate={{
+                x: [0, 10, 0],
+                transition: { repeat: Infinity, duration: 1.5 },
+              }}
+            >
+              <i className="fas fa-arrow-right text-2xl" />
+            </motion.div>
+            <Link to="/volunteer">
               <motion.div
                 className="bg-white border border-gray-300 rounded-full px-4 py-2 flex items-center shadow-lg"
                 whileHover={{ scale: 1.05 }}
@@ -124,9 +123,9 @@ const Donation: React.FC = () => {
                   +1000
                 </motion.span>
               </motion.div>
-            </div>
-          </motion.div>
-        </Link>
+            </Link>
+          </div>
+        </motion.div>
 
         {/* Newsletter Subscription Section */}
         <motion.div
@@ -162,7 +161,7 @@ const Donation: React.FC = () => {
               />
               <input value="1" type="hidden" name="embed" />
               <motion.button
-                className="px-6 py-2 bg-red-500 text-white font-bold rounded-r-full shadow-lg hover:bg-red-600 transition duration-300"
+                className="px-6 py-2 bg-red-500 text-white font-bold rounded-r-full shadow-lg hover:bg-red-600 cursor-pointer transition duration-300"
                 variants={buttonAnimation}
                 whileHover="whileHover"
                 whileTap="whileTap"

public/assets/Images/aman-naik-week4-img2.png

@@ -44,7 +44,7 @@ const FAQItem = ({ index, question, answer }: FAQItemProps) => {
       animate="animate"
     >
       <motion.button
-        className="w-full text-left py-4 text-lg font-medium flex justify-between items-center"
+        className="w-full text-left py-4 text-lg font-medium flex justify-between items-center hover:cursor-pointer"
         onClick={toggleFAQ}
         whileHover="hover"
         variants={faqQuestionButtonVariants}

public/assets/Images/mb4-Palette.png

@@ -58,7 +58,7 @@ export const ActivityCard: React.FC<ActivityCardProps> = ({
     </p>
 
     <a href={href} className="w-full">
-      <button className="w-full py-2 sm:py-3 px-4 sm:px-6 border-2 border-gray-900 rounded-full text-sm sm:text-base md:text-lg font-semibold hover:bg-gray-900 hover:text-white transition-colors">
+      <button className="w-full py-2 sm:py-3 px-4 sm:px-6 border-2 border-gray-900 rounded-full text-sm sm:text-base md:text-lg font-semibold hover:bg-gray-900 cursor-pointer hover:text-white transition-colors">
         {buttonText}
       </button>
     </a>

src/components/AboutUs/ProjectSection.tsx

@@ -11,11 +11,11 @@ image: "assets/Images/c4gt_DMP.png"
 
 <!-- markdownlint-disable -->
 
-# Week 2 Progress Report by Safwan Sayeed
+# Week 2 Progress Report by Justin Charles
 
-**Project:** Music Blocks 4 Program Engine  
-**Mentors:** [Anindya Kundu](https://github.com/meganindya/), [Sumit Srivastava](https://github.com/sum2it)  
-**Assisting Mentors:** [Devin Ullibari](https://github.com/pikurasa/), [Walter Bender](https://github.com/walterbender)  
+**Project:** Music Blocks 4 Masonry  
+**Mentors:** [Anindya Kundu](https://github.com/meganindya/) 
+**Assisting Mentors:** [Devin Ullibari](https://github.com/pikurasa/), [Walter Bender](https://github.com/walterbender), [Sumit Srivastava](https://github.com/sum2it)   
 **Reporting Period:** 2025-06-09 - 2025-06-15  
 
 ---