diff --git a/Frontend/src/App.jsx b/Frontend/src/App.jsx index b2efb27..0541d45 100644 --- a/Frontend/src/App.jsx +++ b/Frontend/src/App.jsx @@ -44,11 +44,11 @@ function App() { loader ? "block" : "hidden" } absolute w-full h-full bg-black opacity-50 top-0 left-0`} > -
+
- Loading... + Loading...
diff --git a/Frontend/src/components/Logs.jsx b/Frontend/src/components/Logs.jsx index 70fa90a..0eb52f7 100644 --- a/Frontend/src/components/Logs.jsx +++ b/Frontend/src/components/Logs.jsx @@ -3,57 +3,57 @@ import { Link } from "react-router-dom"; const Logs = () => { return ( <> -
- - +
+
+ - - - - - + - - - + + + - + - - - + + + - + - - - + + + {" "}
+ Product name + Color + Category + Price
Apple MacBook Pro 17" SilverLaptop$2999SilverLaptop$2999
Microsoft Surface Pro WhiteLaptop PC$1999WhiteLaptop PC$1999
Magic Mouse 2 BlackAccessories$99BlackAccessories$99
{" "} diff --git a/Frontend/src/pages/Home/Footer.jsx b/Frontend/src/pages/Home/Footer.jsx index 7870558..638adf2 100644 --- a/Frontend/src/pages/Home/Footer.jsx +++ b/Frontend/src/pages/Home/Footer.jsx @@ -7,7 +7,10 @@ const Footer = () => {
- + {
  • - + Flowbite
  • - + Tailwind CSS
  • @@ -82,7 +88,7 @@ const Footer = () => {
    © 2024{" "} - + MentorFlux™ . All Rights Reserved. diff --git a/Frontend/src/pages/Home/Hero.jsx b/Frontend/src/pages/Home/Hero.jsx index 882798b..a52337f 100644 --- a/Frontend/src/pages/Home/Hero.jsx +++ b/Frontend/src/pages/Home/Hero.jsx @@ -15,17 +15,17 @@ const Hero = () => { Find Your Perfect Mentor
    -
    + -
    -
    +
    +
    - Check icon + Check icon
    See all diff --git a/Frontend/src/pages/Home/Testimonial.jsx b/Frontend/src/pages/Home/Testimonial.jsx index cc6b4b3..583190a 100644 --- a/Frontend/src/pages/Home/Testimonial.jsx +++ b/Frontend/src/pages/Home/Testimonial.jsx @@ -9,7 +9,9 @@ const Testimonial = () => {
    -

    WHY CHOOSE US

    +

    + WHY CHOOSE US +

    Benefits of online tutoring services with us

    @@ -31,7 +33,9 @@ const Testimonial = () => {
    -

    24/7 Mentor Availability

    +

    + 24/7 Mentor Availability +

    Our Mentors are always available to respond as quick as possible for you @@ -45,38 +49,41 @@ const Testimonial = () => {

    Interactive Session

    - Our digital messaging with audio and video chat features give interactiveness. + Our digital messaging with audio and video chat features give + interactiveness.

    - {/*
    -
    - Icon -

    Interactive Whiteboard

    -

    - Our digital whiteboard equipped with audio and video chat - features -

    -
    -
    -
    -
    - Icon -

    Affordable Prices

    -

    - Choose an expert tutor based on your budget and per hour -

    -
    -
    */} + {/*
    +
    + Icon +

    + Interactive Whiteboard +

    +

    + Our digital whiteboard equipped with audio and video chat + features +

    +
    +
    +
    +
    + Icon +

    Affordable Prices

    +

    + Choose an expert tutor based on your budget and per hour +

    +
    +
    */}
    diff --git a/Frontend/src/pages/Password/ResetPassword.jsx b/Frontend/src/pages/Password/ResetPassword.jsx index 5ea6f86..53b8189 100644 --- a/Frontend/src/pages/Password/ResetPassword.jsx +++ b/Frontend/src/pages/Password/ResetPassword.jsx @@ -109,7 +109,7 @@ const ResetPassword = () => { @@ -127,5 +127,4 @@ const ResetPassword = () => { ); }; - export default ResetPassword; diff --git a/Frontend/src/pages/UserPanel/Farm/AddCrop.jsx b/Frontend/src/pages/UserPanel/Farm/AddCrop.jsx new file mode 100644 index 0000000..a7325e8 --- /dev/null +++ b/Frontend/src/pages/UserPanel/Farm/AddCrop.jsx @@ -0,0 +1,67 @@ +import { useEffect } from "react"; + +const AddCrop = () => { + return ( + <> + {" "} + +
    + + +
    + + + ); +}; + +export default AddCrop; diff --git a/Frontend/src/pages/UserPanel/Farm/FarmPage.jsx b/Frontend/src/pages/UserPanel/Farm/FarmPage.jsx index cf02888..ac586c2 100644 --- a/Frontend/src/pages/UserPanel/Farm/FarmPage.jsx +++ b/Frontend/src/pages/UserPanel/Farm/FarmPage.jsx @@ -1,7 +1,7 @@ import React, { useEffect, useState } from "react"; import { useParams, useNavigate } from "react-router-dom"; import Farm from "./Farm"; -import AddCrop from "../Crops/AddCrop"; +import AddCrop from "./AddCrop"; export default function FarmPage() { const { farmId } = useParams(); diff --git a/Frontend/src/pages/UserPanel/MainUserPanel.jsx b/Frontend/src/pages/UserPanel/MainUserPanel.jsx index f0a512d..4a4e254 100644 --- a/Frontend/src/pages/UserPanel/MainUserPanel.jsx +++ b/Frontend/src/pages/UserPanel/MainUserPanel.jsx @@ -198,7 +198,7 @@ const MainUserPanel = () => {
    -
    +
    Profile Picture -

    {user.name}

    - {/* @thomasdox */} -

    +

    {user.name}

    + {/* @thomasdox */} +

    Join on {user.createdAt && user.createdAt.substring(0, 10)}

    -

    +

    {user.description == null && "I am a Senior Software Engineer at Google and also mentored 50+ students to get there dream job."}

    -
    - -
    + ); }; diff --git a/Frontend/src/pages/UserPanel/Settings.jsx b/Frontend/src/pages/UserPanel/Settings.jsx index e1e47d4..4688118 100644 --- a/Frontend/src/pages/UserPanel/Settings.jsx +++ b/Frontend/src/pages/UserPanel/Settings.jsx @@ -95,15 +95,15 @@ const Settings = () => {
    -
    +