Skip to content

Commit

Permalink
Merge pull request #261 from itsvick/merge-release-1.0.0-to-main
Browse files Browse the repository at this point in the history
Merge release 1.0.0 to main
  • Loading branch information
itsvick authored Oct 14, 2024
2 parents 8e8b1f2 + d7e71ee commit 5193330
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/prod-pratham-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ jobs:
ls -ltra
# Run the deployment script with the correct TAG
./deploy.sh $TAG
./deploy.sh $TAG
10 changes: 10 additions & 0 deletions public/Sample.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name,externalId,description,type,hasAParentTask,parentTaskOperator,parentTaskValue,parentTaskId,isDeletable,learningResources1-name,learningResources1-link,learningResources1-app,learningResources1-type,learningResources1-id,learningResources2-name,learningResources2-link,learningResources2-app,learningResources2-type,minNoOfSubmissionsRequired,sequenceNumber,startDate,endDate,solutionType,solutionSubType,solutionId
Maths-Chapter 1,1,,content,NO,,,,FALSE,,,,,,,,,,,1,09-01-2024,10/31/24,,,
Arithmetic,2,,content,YES,EQUALS,started,1,FALSE,Chemical reaction,https://www.youtube.com/watch?v=TStjgUmL1RQ,Youtube,postrequisite,,,https://www.youtube.com/watch?v=CqN-XIPhMpo,,,subTask1,2,09-01-2024,10/31/24,,,
Polynomials,3,,content,YES,EQUALS,started,1,FALSE,Acid and Base,https://www.youtube.com/watch?v=ja7p_tzTTEA,Youtube,postrequisite,,,https://www.youtube.com/watch?v=rDjWrNRKfvg,,,subTask1,4,09-01-2024,10/31/24,,,
Coordinate geometry,4,,content,YES,EQUALS,started,1,FALSE,Equation of Motion,https://www.youtube.com/watch?v=80gApHJd3iY,Youtube,prerequisite,,,,,,subTask1,3,09-01-2024,10/31/24,,,
Maths-Chapter 2,5,,content,NO,,,,FALSE,,,,,,,,,,,5,09-01-2024,10/31/24,,,
Circles,6,,content,YES,EQUALS,started,5,FALSE,Human Organs,https://www.youtube.com/watch?v=YE2peDF4Zqg,Youtube,prerequisite,,,,,,subTask1,6,09-01-2024,10/31/24,,,
Trigonometry,7,,content,YES,EQUALS,started,5,FALSE,CardioVascular,https://www.youtube.com/watch?v=Vi1JK6IYVt8,Youtube,prerequisite,,,,,,subTask1,7,09-01-2024,10/31/24,,,
Statistics,8,,content,YES,EQUALS,started,5,FALSE,Liver and Kidney,https://www.youtube.com/watch?v=rDjWrNRKfvg,Youtube,postrequisite,,,,,,subTask1,8,09-01-2024,10/31/24,,,
Quadratic Equation,9,,content,YES,EQUALS,started,5,FALSE,Kaade Kess Resource,https://www.youtube.com/watch?v=CqN-XIPhMpo,Youtube,postrequisite,,,https://www.youtube.com/watch?v=CqN-XIPhMpo,,,subTask1,9,09-01-2024,10/31/24,,,
5 changes: 2 additions & 3 deletions public/locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -229,9 +229,8 @@
"LEARNERS_POSTREQISITE":"Learners Post-requisites",
"NO_DATA_POST":"No data available for Learners Post-requisites",
"FACILITATORS":"Facilitators Requisites",
"NO_DATA":"No data available for Facilitators Requisites"


"NO_DATA":"No data available for Facilitators Requisites",
"DOWNLOAD_SAMPLE_CSV":"Download Sample CSV"
},
"MASTER": {
"STATE": "States",
Expand Down
20 changes: 7 additions & 13 deletions src/components/layouts/sidebar/MenuItems.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import masterIcon from '../../../../public/images/database.svg';
import centerIcon from '../../../../public/images/centers.svg';
import dashboardIcon from '../../../../public/images/dashboard.svg';
import userIcon from '../../../../public/images/group.svg';
import coursePannerIcon from '../../../../public/images/event_available.svg';
import masterIcon from "../../../../public/images/database.svg";
import centerIcon from "../../../../public/images/centers.svg";
import dashboardIcon from "../../../../public/images/dashboard.svg";
import userIcon from "../../../../public/images/group.svg";
import coursePannerIcon from "../../../../public/images/event_available.svg";
const ENV = process.env.NEXT_PUBLIC_SHOW_WORKSPACE;


//

//

const Menuitems = [
// {
Expand Down Expand Up @@ -40,8 +38,6 @@ const Menuitems = [
],
},



{
title: "Master ",
icon: masterIcon,
Expand All @@ -66,7 +62,7 @@ const Menuitems = [
icon: coursePannerIcon,
href: "/course-planner",
},
...(ENV === 'true'
...(ENV === "true"
? [
{
title: "SIDEBAR.WORKSPACE",
Expand All @@ -78,5 +74,3 @@ const Menuitems = [
];

export default Menuitems;


18 changes: 14 additions & 4 deletions src/pages/importCsv.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,16 @@ const ImportCsv = () => {
setSelectedFile(null);
};

const handleDownloadCSV = () => {
const link = document.createElement("a");
link.href = "/Sample.csv";
link.download = "Sample.csv";
document.body.appendChild(link);
link.click();
document.body.removeChild(link);
};


const handleUpload = async () => {
if (selectedFile) {
const metaData: CoursePlannerMetaData = {
Expand Down Expand Up @@ -350,7 +360,7 @@ const ImportCsv = () => {
>
{t("COURSE_PLANNER.IMPORT_PLANNER")}
</Button>
{/* <Button
<Button
variant="outlined"
sx={{
borderRadius: "8px",
Expand All @@ -361,10 +371,10 @@ const ImportCsv = () => {
color: "#333333",
},
}}
onClick={handleRemoveFile}
onClick={handleDownloadCSV}
>
{t("COURSE_PLANNER.REMOVE_FILE")}
</Button> */}
{t("COURSE_PLANNER.DOWNLOAD_SAMPLE_CSV")}
</Button>
<Button
sx={{
borderRadius: "8px",
Expand Down

0 comments on commit 5193330

Please sign in to comment.