Skip to content
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.

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

Assesment/multipleoption #1067

Merged
merged 20 commits into from
Jan 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
6177f13
assement change
saloni-080601 Oct 9, 2023
464300f
assesment/multiple changeing
saloni-080601 Oct 16, 2023
946533f
checkbox_and_radiobutton_functionality_change
Tamannatanwa Oct 17, 2023
c024ac9
Completed the logic part for the multiple choice assessement.
amansharmma Oct 23, 2023
0da8c3d
Fixed the assessment bug and implementing the multiple choice section.
amansharmma Nov 5, 2023
143775b
Worked for the multiple option functionality
amansharmma Nov 9, 2023
5281374
Updated assessement
amansharmma Nov 16, 2023
48a3706
Implemented the MCQ & SCQ for the Assessment.
amansharmma Nov 17, 2023
24795ac
Resolved Conflicts.
amansharmma Nov 18, 2023
9205ed8
Implemented the Img section for the MCQ.
amansharmma Nov 22, 2023
53004eb
Fixed some style part, Resolved conflicts, Fixed some Feedbacks, Adde…
amansharmma Nov 28, 2023
7e443f4
Resolved Conflicts.
amansharmma Nov 28, 2023
d9375e3
Merge branch 'dev' of https://github.com/navgurukul/bhanwari-devi int…
amansharmma Nov 30, 2023
33e6833
Updating the design & Functionality for the assessmets.
amansharmma Dec 2, 2023
9c18cba
Fixed bug
amansharmma Dec 5, 2023
36045c0
Fixed some Feedback Parts.
amansharmma Dec 8, 2023
fbc7f11
Fixed Styling, Functionality.
amansharmma Dec 13, 2023
ae95ae5
working on checkbox and radio button design in Assesments
Tamannatanwa Dec 25, 2023
5c4bc2b
adding style to radio CancelIcon
Tamannatanwa Dec 26, 2023
5f41639
Merge pull request #1089 from navgurukul/Assesment/Checkbox
amansharmma Jan 3, 2024
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
2 changes: 1 addition & 1 deletion src/components/Class/ClassForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ function ClassForm({
}
axios({
method: METHODS.GET,
url: `${process.env.REACT_APP_MERAKI_URL}/courses/${courseId}/exercises`,
url: `${process.env.REACT_APP_MERAKI_URL}/courses/${courseId}/exercises/v2`,
headers: {
accept: "application/json",
"version-code": versionCode,
Expand Down
2 changes: 1 addition & 1 deletion src/components/Class/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ function Class({ classToEdit, indicator }) {
}
axios({
method: METHODS.GET,
url: `${process.env.REACT_APP_MERAKI_URL}/courses/${courseId}/exercises`,
url: `${process.env.REACT_APP_MERAKI_URL}/courses/${courseId}/exercises/v2`,
headers: {
accept: "application/json",
"version-code": versionCode,
Expand Down
5 changes: 3 additions & 2 deletions src/components/Course/redux/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,13 @@ export const getCourses = () => {
export const getCourseContent = (data) => {
const { courseId, lang, versionCode, user } = data;
return axios({
url: `${process.env.REACT_APP_MERAKI_URL}/courses/${courseId}/exercises?lang=${lang}`,
url: `${process.env.REACT_APP_MERAKI_URL}/courses/${courseId}/exercises/v2?lang=${lang}`,
method: METHODS.GET,
headers: {
"version-code": versionCode,
accept: "application/json",
Authorization: user?.data?.token ?? localStorage.getItem("studentAuthToken"),
Authorization:
user?.data?.token ?? localStorage.getItem("studentAuthToken"),
},
// headers: HeaderFactory(token),
});
Expand Down
10 changes: 2 additions & 8 deletions src/components/Header/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -187,10 +187,7 @@ const PublicMenuOption = ({ leftDrawer, toggleDrawer }) => {
borderRadius: "8px",
}}
>
<Typography
variant="subtitle1"
className={classes.donate}
>
<Typography variant="subtitle1" className={classes.donate}>
Donate
<LaunchOutlinedIcon sx={{ pl: "5px" }} />
</Typography>
Expand All @@ -208,10 +205,7 @@ const PublicMenuOption = ({ leftDrawer, toggleDrawer }) => {
target="_blank"
style={{ textDecoration: "none", color: "black" }}
>
<Typography
variant="subtitle1"
className={classes.scratchLink}
>
<Typography variant="subtitle1" className={classes.scratchLink}>
Scratch
<OpenInNewIcon style={{ color: "Black", paddingLeft: "9px" }} />
</Typography>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Header/styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const useStyles = makeStyles((theme) => ({
backgroundColor: "#E9F5E9",
borderRadius: "8px",
},
}
},
}));

export default useStyles;
11 changes: 7 additions & 4 deletions src/components/PathwayCourse/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,8 @@ function PathwayCourse() {
url: `${process.env.REACT_APP_MERAKI_URL}/certificate?pathway_code=${certificateCode}`,
headers: {
accept: "application/json",
Authorization: user?.data?.token || localStorage.getItem("studentAuthToken"),
Authorization:
user?.data?.token || localStorage.getItem("studentAuthToken"),
},
})
.then((response) => {
Expand Down Expand Up @@ -209,7 +210,8 @@ function PathwayCourse() {
url: `${process.env.REACT_APP_MERAKI_URL}/teacher/checking`,
headers: {
accept: "application/json",
Authorization: user?.data?.token || localStorage.getItem("studentAuthToken"),
Authorization:
user?.data?.token || localStorage.getItem("studentAuthToken"),
},
})
.then((response) => {
Expand All @@ -232,7 +234,8 @@ function PathwayCourse() {
url: `${process.env.REACT_APP_MERAKI_URL}/pathways/${pathwayId}/completePortion`,
headers: {
accept: "application/json",
Authorization: user?.data?.token || localStorage.getItem("studentAuthToken"),
Authorization:
user?.data?.token || localStorage.getItem("studentAuthToken"),
},
})
.then((response) => {
Expand Down Expand Up @@ -439,7 +442,7 @@ function PathwayCourse() {
<>
<PathwayCards
userEnrolledClasses={userEnrolledClasses}
data={pathwayCourse.data}
data={pathwayCourse?.data}
/>
</>
) : (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function LastCoursePage({ C4CALastPage }) {
const isActive = useMediaQuery("(max-width:" + breakpoints.values.sm + "px)");
const history = useHistory();
const params = useParams();
const studentAuthToken = localStorage.getItem("studentAuthToken");
const studentAuthToken = localStorage.getItem("studentAuthToken");
return (
<>
<Container maxWidth="lg" align="center">
Expand Down
Loading