Merge pull request #1530 from gtech-mulearn/dev

dev
gtech-mulearn · May 21, 2024 · aeadb08 · aeadb08
2 parents b1268c3 + 1b6a96c
commit aeadb08
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/src/modules/Dashboard/modules/ManageUsers/UserForm.tsx b/src/modules/Dashboard/modules/ManageUsers/UserForm.tsx
@@ -378,7 +378,7 @@ const UserForm = forwardRef(
                                 placeholder="Mobile"
                                 value={data.mobile}
                                 onChange={handleChange}
-                                onBlur={handleBlur}
+
                             />
                             {errors.mobile && (
                                 <div style={{ color: "red" }}>

diff --git a/src/modules/Public/Donation/Donation.tsx b/src/modules/Public/Donation/Donation.tsx
@@ -1,4 +1,5 @@
 import { useEffect, useRef, useState } from "react";
+import { Link } from "react-router-dom";
 import toast from "react-hot-toast";
 import Footer from "./components/Footer";
 import Navbar from "./components/Navbar";
@@ -207,7 +208,7 @@ const Donation = () => {
                                 }
                                 onClick={() => handleAmountClick(10000)}
                             >
-                                10,000
+                                ₹10,000
                             </button>
                             <button
                                 type="button"
@@ -218,7 +219,7 @@ const Donation = () => {
                                 }
                                 onClick={() => handleAmountClick(15000)}
                             >
-                                15,000
+                                ₹15,000
                             </button>
                             <button
                                 type="button"
@@ -229,15 +230,15 @@ const Donation = () => {
                                 }
                                 onClick={() => handleAmountClick(20000)}
                             >
-                                20,000
+                                ₹20,000
                             </button>
                         </label>
                         <div className={styles.CurrencyContainer}>
                             <p>{"INR"}</p>
                             <input
                                 type="number"
                                 id="amount"
-                                placeholder="10,000"
+                                placeholder="₹10,000"
                                 aria-label="Amount"
                                 className={[
                                     styles.DonationInputStyles,
@@ -254,8 +255,12 @@ const Donation = () => {
                         <div className={styles.TermsContainer}>
                             <input id="check" type="checkbox" required></input>
                             <label htmlFor="check">
-                                By clicking "Donate", you agree to our Terms and
-                                Conditions, Privacy Policy and Refund Policy.
+                                By clicking "Donate", you agree to our <Link to="https://mulearn.org/termsandconditions" target="_blank" rel="noopener noreferrer" >
+                                    <u>
+                                        Terms and
+                                        Conditions
+                                    </u>
+                                </Link>, <Link to="https://mulearn.org/privacypolicy" target="_blank" rel="noopener noreferrer" ><u>Privacy Policy</u></Link> and <Link to="./refund" target="_blank" rel="noopener noreferrer" ><u>Refund Policy</u></Link>.
                                 Please read these documents carefully before
                                 completing your donation.
                             </label>

diff --git a/src/modules/Public/Donation/components/Footer.tsx b/src/modules/Public/Donation/components/Footer.tsx
@@ -1,5 +1,6 @@
 import styles from "./Footer.module.css";
 import { footerData } from "../services/footerData";
+import { Link } from "react-router-dom";
 import {
     RiWhatsappFill,
     RiTwitterFill,
@@ -8,12 +9,15 @@ import {
     RiYoutubeFill,
     RiFacebookBoxFill
 } from "react-icons/ri";
+
+
+
 export default function Footer() {
     return (
         <footer className={styles.footer}>
             <div className={styles.container}>
                 <div className={styles.footerLogo}>
-                    <img src="https://i.ibb.co/FDQ2M4n/Learn.png" alt="mulearn" />
+                    <Link to="https://mulearn.org/"><img src="https://i.ibb.co/FDQ2M4n/Learn.png" alt="mulearn" /></Link>
                     <p>µLearn is one of India's largest student communities that provides learn new skills, network with peers. Oru line koode venam just to make it aesthetic.</p>
                 </div>
                 {footerData.map((data, index) => {

diff --git a/src/modules/Public/Donation/components/Navbar.tsx b/src/modules/Public/Donation/components/Navbar.tsx
@@ -7,7 +7,7 @@ export default function Navbar(){
 
     return(
         <nav className={styles.LClandingPageNav}>
-                <img src="https://i.ibb.co/vY786NX/image.png" alt="muLearn" />
+                <Link to="https://mulearn.org/"><img src="https://i.ibb.co/vY786NX/image.png" alt="muLearn" /></Link>
                 <div className={styles.navLinks}>
                     <div>
                         <Link to="https://mulearn.org/">About</Link>