+
{reason.title}
-
+
{reason.description}
diff --git a/client/.env b/client/.env index fad152f..49866b6 100644 --- a/client/.env +++ b/client/.env @@ -1,8 +1,13 @@ -VITE_API_URL = http://13.49.21.227:8080 -VITE_TARGET_URL = http://13.49.21.227:8080 -VITE_SOCKET_URL = http://13.49.21.227:3000/ +# VITE_API_URL = http://13.49.21.227:8080 +# VITE_TARGET_URL = http://13.49.21.227:8080 +# VITE_SOCKET_URL = http://13.49.21.227:3000/ # VITE_API_URL = http://localhost:8080/ -# VITE_TARGET_URL = http://localhost:8000 -# VITE_SOCKET_URL = http://localhost:3000/ \ No newline at end of file +# VITE_TARGET_URL = http://localhost:8080 +# VITE_CLIENT_URL = http://localhost:4000/ +# VITE_SOCKET_URL = http://localhost:3000 +VITE_TARGET_URL = http://192.168.43.158:8080/ +VITE_TARGET_URL = http://192.168.43.158:8080 +VITE_SOCKET_URL = http://192.168.43.158:3000 +VITE_CLIENT_URL = http://192.168.43.158:4000/ diff --git a/client/index.html b/client/index.html index 975646f..b86fe6c 100644 --- a/client/index.html +++ b/client/index.html @@ -1,15 +1,34 @@ -
- - - -- Find exceptional talent for your business at TalentHub Ethiopia and unlock new opportunities for growth. -
++ {data.role} +
++ {data.description} +
++ About +
+
- AASTU{" "}
-
+ {exam.organization?.name}
+ { exam.organization?.isVerified &&
- Lorem ipsum dolor sit amet consectetur, adipisicing elit. Ab hic veritatis molestias culpa in, - recusandae laboriosam neque aliquid libero nesciunt voluptate dicta quo officiis explicabo - consequuntur distinctio corporis earum similique! + Fetena.com offers an intuitive interface that simplifies the exam creation process. Educators can easily set up exams with various question types, including multiple-choice and essays, making the process quick and efficient.
@@ -31,7 +29,7 @@ const Faq = () => {- Lorem ipsum dolor sit amet consectetur, adipisicing elit. Ab hic veritatis molestias culpa in, - recusandae laboriosam neque aliquid libero nesciunt voluptate dicta quo officiis explicabo - consequuntur distinctio corporis earum similique! + Fetena.com employs robust security measures to prevent cheating and ensure exam integrity. Features such as real-time monitoring and secure browser settings help maintain a fair testing environment.
@@ -55,7 +51,7 @@ const Faq = () => {- Lorem ipsum dolor sit amet consectetur, adipisicing elit. Ab hic veritatis molestias culpa in, - recusandae laboriosam neque aliquid libero nesciunt voluptate dicta quo officiis explicabo - consequuntur distinctio corporis earum similique! + Yes, Fetena.com provides automated grading tools that enable quick and accurate assessment of exams. This feature delivers instant results to students, saving time and reducing manual grading efforts for educators.
@@ -79,7 +73,7 @@ const Faq = () => {- Lorem ipsum dolor sit amet consectetur, adipisicing elit. Ab hic veritatis molestias culpa in, - recusandae laboriosam neque aliquid libero nesciunt voluptate dicta quo officiis explicabo - consequuntur distinctio corporis earum similique! + Fetena.com includes real-time monitoring features that allow examiners to oversee the exam process as it happens. This helps ensure that all examinees follow the rules and maintains the integrity of the exam.
diff --git a/client/src/Components/FeatureSection1.jsx b/client/src/Components/FeatureSection1.jsx index b894352..cdeb697 100644 --- a/client/src/Components/FeatureSection1.jsx +++ b/client/src/Components/FeatureSection1.jsx @@ -16,7 +16,7 @@ const FeatureSection1 = ({ featuresData }) => { loading="lazy" width="100%" // Adjust width as needed height="auto" // Maintain aspect ratio - className="rounded-2xl group-hover:scale-105 transition-all ease-in-out duration-300 + className="rounded-2xl group-hover:scale-105 transition-all ease-in-out duration-300 w-96 mx-auto " /> @@ -24,8 +24,8 @@ const FeatureSection1 = ({ featuresData }) => {{description}
diff --git a/client/src/Components/FeatureSection2.jsx b/client/src/Components/FeatureSection2.jsx index e03a687..516d6e1 100644 --- a/client/src/Components/FeatureSection2.jsx +++ b/client/src/Components/FeatureSection2.jsx @@ -12,8 +12,8 @@ const FeatureSection2 = ({ featuresData }) => {{description}
@@ -27,7 +27,7 @@ const FeatureSection2 = ({ featuresData }) => { loading="lazy" width="100%" // Adjust width as needed height="auto" // Maintain aspect ratio - className="rounded-2xl group-hover:scale-105 transition-all ease-in-out duration-300" + className="rounded-2xl group-hover:scale-105 transition-all ease-in-out duration-300 w-96 mx-auto" /> diff --git a/client/src/Components/Footer.jsx b/client/src/Components/Footer.jsx index f682f1b..e1e68b2 100644 --- a/client/src/Components/Footer.jsx +++ b/client/src/Components/Footer.jsx @@ -98,7 +98,7 @@ const Footer = () => {
- Empowering Ethiopians to find and create jobs, work and connect with
professionals.
-
+ Fetena.com makes it easy for examiners to create, conduct, and grade exams online, while ensuring a secure and seamless experience for examinees.
+Lorem ipsum dolor sit amet consectetur adipisicing elit. Aut, dicta facilis atque quaerat odit nemo magni! Totam eveniet ducimus dignissimos eius quaerat voluptates vel minus esse dolores, ipsum quisquam placeat!
++ Fetena.com offers a straightforward solution for transitioning from traditional paper-based exams to a modern, online platform.
+
{reason.description}
- Points {question.points} -
-- Question Type:{" "} - - {question.questionType} - -
-- Question Text:{" "} - - {question.questionText} - -
-- Correct Answer:{" "} - - {question.correctAnswer} - -
-- Question Type:{" "} - - {question.questionType} - -
-- Question Text:{" "} - - {question.questionText} - -
-- Correct Answer:{" "} - - {question.correctAnswer} - -
-{choice}
-- Question Type:{" "} - - {question.questionType} - -
-- Question Text:{" "} - - {question.questionText} - -
-- Question Type:{" "} - - {question.questionType} - -
-- Question Text:{" "} - - {question.questionText} - -
-
+ {promptResponse}
+
+ Enter the Instructions for the exam here
++ Enter the Instructions for the exam here +
+
- Organization :
- AASTU{" "}
-
+ Organization : {basicInfoValues.organization.name}
+ {workspace.isVerified ?
Created by : {user.firstName} {user.lastName}{" "}
+ + + +
+ Certification :
+
+ {basicInfoValues.hasCertificate ?
+ Visibility :
+
+ {basicInfoValues.visibility === 'public' ?
Private Answer :
- {basicInfoValues.privateAnswer ? "Yes" : "No"}
+ {basicInfoValues.privateAnswer ?
Private Score :
- {basicInfoValues.privateScore ? "Yes" : "No"}
+ {basicInfoValues.privateScore ?
@@ -360,19 +353,19 @@ console.log("one add questions start--------------------------------------------
Calculator :
- {basicInfoValues.calculator ? "Yes" : "No"}
+ {basicInfoValues.calculator ?
Formulas Collection :{" "}
- {basicInfoValues.formulasCollection ? "Yes" : "No"}
+ {basicInfoValues.formulasCollection ?
Upload Materials :
- {basicInfoValues.uploadMaterials ? "Yes" : "No"}
+ {basicInfoValues.uploadMaterials ?
Organization : AASTU
Organization : {basicInfoValues.organization.name}
+ {basicInfoValues.organization.isVerified ?
+
+ Created by : + {user.firstName} {user.lastName}{" "} +
-Created by : {user.firstName} {user.lastName}
- +
+ Certification :
+
+ {basicInfoValues.hasCertificate ?
- Private Answer : {basicInfoValues.privateAnswer ? "Yes" : "No"}
+ Private Answer : {basicInfoValues.privateAnswer ?
- Private Score : {basicInfoValues.privateScore ? "Yes" : "No"}
+ Private Score : {basicInfoValues.privateScore ?
@@ -324,17 +319,17 @@ const confirmDeleteQuestion = () => {
Calculator :
- {basicInfoValues.calculator ? "Yes" : "No"}
+ {basicInfoValues.calculator ?
Formulas Collection :
- {basicInfoValues.formulasCollection ? "Yes" : "No"}
+ {basicInfoValues.formulasCollection ?
Upload Materials :
- {basicInfoValues.uploadMaterials ? "Yes" : "No"}
+ {basicInfoValues.uploadMaterials ?
Exam Name : {exam.examName}
-- Starts at : {new Date(exam.startDate).toLocaleString()} +
+ Exam Name : + {exam.examName}
-- Points : {exam.points} +
+ Starts at : + {new Date(exam.startDate).toLocaleString()} +
++ Points : + {exam.points}
{/*Questions : {exam.questions}
*/} -- Time limit : {exam.duration} Minutes +
+ Time limit : + {exam.duration} Minutes
- Organization : +
+ Organization :
{exam.organization?.name}{" "}
{exam.organization?.isVerified && (
-
- Created by : - {exam.createdBy.firstName} {" "} {exam.createdBy.lastName} + +
+ Created by : + {exam.createdBy.firstName} {exam.createdBy.lastName}
- This exam willl send your name, email and photo to the examiner. - Perferendis consectetur accusamus, culpa veniam perspiciatis - suscipit ut impedit totam similique aperiam? Libero, placeat. - Veniam velit libero assumenda distinctio accusantium expedita sed. - Lorem ipsum, dolor sit amet consectetur adipisicing elit. Iusto - soluta ab ipsam, qui repellendus ut incidunt delectus ipsum error - repudiandae hic nemo doloremque consequuntur, ipsa, provident - reiciendis inventore adipisci? Facilis? -
+- This exam willl send your name, email and photo to the examiner. - Libero, placeat. Veniam velit libero assumenda distinctio - accusantium expedita sed. Lorem ipsum, dolor sit amet consectetur - adipisicing elit. Iusto soluta ab ipsam, qui repellendus ut - incidunt delectus ipsum error repudiandae hic nemo doloremque - consequuntur, ipsa, provident reiciendis inventore adipisci? - Facilis? -
-Good Luck!
+Good Luck!
+ {seeStatusOf === "all" + ? "Announce" + : "Message " + currentUser?.user?.fullName} +
+Examinees
- - {/*Examinees
+You currently have no exams created.
- Exam: {currentExam.examName} +
+ Exam :{" "} + + {" "} + {currentExam.examName} +
{examStatus === "open" ? ( - +
Starts at :
{new Date(currentExam.startDate).toLocaleString()}
@@ -313,9 +338,44 @@ const MonitoringPage = () => {
currentExam={currentExam}
socket={socket}
/>
- {seeStatusOf !== "all" && (
-
Examinee History
+Examinee History
+
Organization :
- AASTU{" "}
-
-
Created by : {user.firstName} {user.lastName}{" "}
+
+ Certification :
+
+ {exam.hasCertificate ?
Private Answer :
- {exam.privateAnswer ? "Yes" : "No"}
+ {exam.privateAnswer ?
Private Score :
- {exam.privateScore ? "Yes" : "No"}
+ {exam.privateScore ?
Security level : @@ -172,17 +173,17 @@ const Preview = () => {
Calculator :
- {exam.toolsPermitted.includes("calculator") ? "Yes" : "No"}
+ {exam.toolsPermitted.includes("calculator") ?
Formulas Collection :{" "}
- {exam.formulasCollection ? "Yes" : "No"}
+ {exam.formulasCollection ?
Upload Materials :
- {exam.uploadMaterials ? "Yes" : "No"}
+ {exam.uploadMaterials ?
Loading...
} + {!loading && (
+ {organization?.name}{" "}
+
+
Loading...
} + {!loading && ( +{organization?.name}{" "} {organization?.isVerified && ( @@ -122,9 +74,8 @@ const UserExamsPage = () => { return (
Featured
} - {activeTabKey === "Taken" &&Taken
} ++ Total Exams +
++ Certified Exams +
++ Examiners +
++ Followers +
++ Address : Addis + Ababa Science & Technology University , Addis Ababa , Ethiopia +
++ Email : + fetena@gmail.com +
++ Tel : +2519456789 +
+