Skip to content

Commit

Permalink
Merge pull request #206 from upendraTekdi/updated_code_teacher_app
Browse files Browse the repository at this point in the history
Updated code teacher app
  • Loading branch information
itsvick authored Aug 29, 2024
2 parents 8f2228e + e7fd2e5 commit a7c75c6
Show file tree
Hide file tree
Showing 66 changed files with 3,737 additions and 2,465 deletions.
14 changes: 8 additions & 6 deletions .env
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# NEXT_PUBLIC_BASE_URL=https://qa.prathamteacherapp.tekdinext.com/user/v1
NEXT_PUBLIC_BASE_URL=https://backend.prathamdigital.org/user/v1
NEXT_PUBLIC_EVENT_BASE_URL=https://qa.prathamteacherapp.tekdinext.com/event-service/event/v1
NEXT_PUBLIC_NOTIFICATION_BASE_URL=https://qa.prathamteacherapp.tekdinext.com/notification-service
NEXT_PUBLIC_TELEMETRY_URL=https://qa.prathamteacherapp.tekdinext.com

NEXT_PUBLIC_EVENT_BASE_URL=https://event-pratham.tekdinext.com/event-service/event/v1
NEXT_PUBLIC_TELEMETRY_URL=https://qa.prathamteacherapp.tekdinext.com/telemetry
NEXT_PUBLIC_MEASUREMENT_ID= G-GNMQZ8Z65Z
NEXT_PUBLIC_TRACKING_API_URL=https://tracking-pratham.tekdinext.com
NEXT_PUBLIC_SHIKSHALOKAM_API_URL=https://dev.elevate-apis.shikshalokam.org/project/v1
NEXT_PUBLIC_SHIKSHALOKAM_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJkYXRhIjp7ImlkIjoyNjIsIm5hbWUiOiJ0ZWtkaVRlc3RVc2VyIiwic2Vzc2lvbl9pZCI6NjExNiwib3JnYW5pemF0aW9uX2lkIjoxLCJyb2xlcyI6W3siaWQiOjEyLCJ0aXRsZSI6InByb2dyYW1fZGVzaWduZXIiLCJsYWJlbCI6IlByb2dyYW0gRGVzaWduZXIiLCJ1c2VyX3R5cGUiOjAsInN0YXR1cyI6IkFDVElWRSIsIm9yZ2FuaXphdGlvbl9pZCI6MSwidmlzaWJpbGl0eSI6IlBVQkxJQyJ9LHsiaWQiOjIxLCJ0aXRsZSI6ImRpc3RyaWN0X3Jlc291cmNlX3BlcnNvbiIsImxhYmVsIjoiRGlzdHJpY3QgUmVzb3VyY2UgUGVyc29uIiwidXNlcl90eXBlIjowLCJzdGF0dXMiOiJBQ1RJVkUiLCJvcmdhbml6YXRpb25faWQiOjI0LCJ2aXNpYmlsaXR5IjoiUFVCTElDIn1dfSwiaWF0IjoxNzI0ODI1MDM5LCJleHAiOjE3MjQ5MTE0Mzl9.HAK4_MAo-8tqxcVoLNDRuyNj_S_hqM8X5Pya1gKPXKg
# NEXT_PUBLIC_BASE_URL=https://backend.prathamdigital.org/user/v1
# NEXT_PUBLIC_NOTIFICATION_BASE_URL=https://notification.prathamdigital.org
# NEXT_PUBLIC_TRACKING_API_URL=https://tracking.prathamdigital.org
10 changes: 9 additions & 1 deletion app.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export const toastAutoHideDuration: number = 5000; // 5 seconds
// export const tenantId: string = 'ef99949b-7f3a-4a5f-806a-e67e683e38f3';
export const tenantId: string = 'b73ddc86-7044-4ae1-9e0c-0eaabbc6f62a';
export const idealTimeForSession: string = '120';
export const timeZone: string = 'Asia/Kolkata';
export const dropoutReasons = [
{
label: 'UNABLE_TO_COPE_WITH_STUDIES',
Expand Down Expand Up @@ -73,6 +74,13 @@ export const DaysOfWeek = {
Sat: 6,
};

export const Program = "Second chance";

export enum AssessmentType {
PRE_TEST = 'Pre Test',
POST_TEST = 'Post Test',
}

// handle component by this condition
export const ShowCenterSessionsTab = false;

Expand All @@ -97,4 +105,4 @@ export const tourGuideNavigtion = false

export const showMyTimeTable = false

export const showEventsByList = false
export const showEventsByList = false
29 changes: 25 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"@tanstack/react-query": "^5.45.1",
"axios": "^1.6.8",
"date-fns": "^3.6.0",
"dayjs": "^1.11.13",
"fingerprintjs2": "^2.1.4",
"i18next": "^23.11.4",
"i18next-resources-to-backend": "^1.2.1",
Expand All @@ -53,6 +54,7 @@
"react-toastify": "^10.0.5",
"recharts": "^2.12.7",
"sharp": "^0.33.3",
"swiper": "^11.1.10",
"zustand": "^4.5.4"
},
"devDependencies": {
Expand Down
62 changes: 42 additions & 20 deletions public/locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"SURE_LOGOUT": "Are you sure you want to Logout?",
"SURE_UPDATE": "Are you sure you want to update this attendance?",
"SURE_REMOVE": "Are you sure you want to remove this learner?",
"SURE_REASSIGN_CENTER": "Are you sure you want to re-assign Center to this user?",
"SURE_REASSIGN_CENTER": "Are you sure you want to re-assign center to this user?",
"SURE_CLOSE": "Are you sure you want to close without saving?",
"LEARNER_LIST": "Learners List",
"FACILITATOR_LIST": "Facilitators List",
Expand All @@ -104,7 +104,7 @@
"DELETE_USER": "Delete User Permanently",
"REMOVE_USER_FROM_CLASS": "Remove user from class",
"DELETE_USER_WITH_REASON": "Delete User",
"USER_DELETED_PERMANENTLY": "User Successfully Deleted!",
"USER_DELETED_PERMANENTLY": "User successfully deleted!",
"OBSERVATIONS_FORMS": "Observations and Forms",
"OTHER_REASON": "Other Reason",
"OTHER_REASON_PLACEHOLDER": "Enter Other Reason",
Expand All @@ -113,7 +113,8 @@
"CREDENTIALS_EMAILED": "The login credentials will be emailed to the Facilitator at ",
"CREDENTIALS_EMAILED_OF_LEARNER": "The login credentials have been send to your email ",
"NEW": "New {{role}}",
"USER_CREDENTIAL_SEND_SUCCESSFULLY": "User Credentials Sent Successfully!",
"USER_CREDENTIAL_SEND_SUCCESSFULLY": "User credentials sent successfully!",
"USER_CREDENTIAL_SEND_FAILED": "User credentials failed to send!",
"CENTER_SESSIONS": "Center Sessions",
"SCHEDULE_NEW": "Schedule New",
"UPCOMING_EXTRA_SESSION": "Upcoming Extra Sessions (Next {{days}} days)",
Expand All @@ -128,7 +129,7 @@
"NEW_FACILITATOR": "New Facilitator",
"EDIT_FACILITATOR": "Edit Facilitator",
"SUBMIT": "Submit",
"LEARNER_CREATED_SUCCESSFULLY": "Leaner has been Successfully Created!",
"LEARNER_CREATED_SUCCESSFULLY": "Leaner has been successfully created!",
"FACILITATOR_ADDED_SUCCESSFULLY": "Facilitator added successfully!",
"LEARNER_UPDATED_SUCCESSFULLY": "Learner profile updated successfully!",
"FACILITATOR_UPDATED_SUCCESSFULLY": "Facilitator profile updated successfully!",
Expand Down Expand Up @@ -305,7 +306,7 @@
"GUIDE_TOUR": {
"STEP_1": "Welcome! Let’s take a quick tour to understand the key features that will help you with your daily tasks.",
"STEP_2": "This section provides a quick overview of attendance trends to help you spot key insights for each center. You can mark attendance, check daily attendance percentages, and modify previous attendance for the last 7 days.",
"STEP_3": "Access the full calendar to track your attendance for any month and see which learners were present each day.",
"STEP_3": "Access the full calendar to track learners' attendance for any month and see who was present or absent each day.",
"STEP_4": "Use this button to view a detailed overview of center attendance and see a list of learners categorized by low, average, and good attendance for any custom date range.",
"STEP_5": "Update your preferred language anytime from here.",
"STEP_6": "Access your teaching centers and manage tasks like adding, editing, or removing learners, marking dropouts, and reassigning centers or blocks. You can also easily schedule online or offline sessions for your subjects.",
Expand Down Expand Up @@ -341,14 +342,14 @@
"CENTER_TYPE": "Center Type",
"UNIT_NAME": "Unit Name",
"NOTE": "Note: This will be the center name",
"CENTER_CREATED": "Center Created Successfully!",
"CENTER_CREATED": "Center created successfully!",
"RENAME_CENTER": "Rename Center",
"REQUEST_TO_DELETE": "Request to Delete",
"RENAME": "Rename",
"CENTER_RENAMED": "Center Renamed Successfully!",
"CENTER_RENAMED": "Center renamed successfully!",
"SEND_REQUEST": "Send Request",
"REQUEST_TO_DELETE_HAS_BEEN_SENT": "Request to Delete has been sent",
"YOU_ARE_SENDING_REQUEST_TO_THE_STATE_ADMIN": "You are sending a request to the State Admin to delete this Center",
"YOU_ARE_SENDING_REQUEST_TO_THE_STATE_ADMIN": "You are sending a request to the State Admin to delete this center",
"THE_USER_BELONGS_TO_THE_FOLLOWING_COHORT": "The user belongs to the following cohort: ",
"PLEASE_REMOVE_THE_USER_FROM_COHORT": "Please remove the user from these cohorts before proceeding with deletion.",
"ERROR_EMPTY": "Center name cannot be empty",
Expand All @@ -363,8 +364,8 @@
"THIS_SESSION": "This session",
"FOLLOWING_SESSIONS": "This and following sessions",
"MODE_OF_SESSION": "Mode of Session",
"OFFLINE": "Offline",
"ONLINE": "Online",
"OFFLINE": "offline",
"ONLINE": "online",
"SUBJECT": "Subject",
"MEETING_LINK": "Meeting Link",
"MEETING_PASSCODE": "Meeting Passcode (if applicable)",
Expand All @@ -380,6 +381,7 @@
"TOPIC": "Topic",
"SUBTOPIC": "Sub Topic",
"FACILITATORS": " Facilitators Pre-requisites",
"LEARNERS": " Learners Pre-requisites",
"TITLE": "Title",
"DELETE_SESSION": "Delete Session",
"SCHEDULE": "Schedule",
Expand All @@ -394,21 +396,25 @@
"SUBJECT_OPTIONAL": "Subject (Optional)",
"RECURRING_ONLINE": "Recurring online",
"RECURRING_OFFLINE": "Recurring offline",
"EXTRA_ONLINE": "Extra online",
"EXTRA_OFFLINE": "Extra offline",
"ENTER_VALID_MEETING_LINK": "Please enter a valid Zoom or Google Meet link.",
"ZOOM": "Zoom",
"GOOGLEMEET": "GoogleMeet",
"GOOGLE_MEET": "GOOGLE_MEET",
"SET_UP": "Set-Up",
"EDIT_THIS_SESSION": " Edit this session",
"EDIT_FOLLOWING_SESSIONS": " Edit this and following sessions",
"EDIT_THIS_SESSION": "Edit this session",
"EDIT_FOLLOWING_SESSIONS": "Edit this and following sessions",
"DELETE_SESSION_MSG": "Are you sure you want to delete this session?",
"DELETE_ALL_SESSION_MSG": "Are you sure you want to delete all sessions in this series?",
"DELETE_THIS_SESSION": "Delete this session",
"DELETE_FOLLOWING_SESSION": "Delete this and following sessions",
"UPDATE_CHANGES": "Are you sure you want to update the changes?"
"UPDATE_CHANGES": "Are you sure you want to update the changes?",
"SESSION_DELETED_SUCCESSFULLY": "Session deleted successfully",
"SESSION_EDITED_SUCCESSFULLY": "Session updated successfully"
},
"MANAGE_USERS": {
"CENTERS_REQUESTED_SUCCESSFULLY": "Center Requested Successfully",
"CENTERS_REQUEST_FAILED": "Center Requested Failed"
"CENTERS_REQUESTED_SUCCESSFULLY": "Center requested successfully",
"CENTERS_REQUEST_FAILED": "Center Request Failed"
},
"FORM": {
"FULL_NAME": "Full Name",
Expand All @@ -433,7 +439,7 @@
"ENTER_YOUR_FATHER_NAME": "Enter Your Father Name",
"CLASS_OR_LAST_PASSED_GRADE": "Class (Last passed grade)",
"NO_SCHOOLING": "No Schooling",
"REASON_FOR_DROPOUT_FROM_SCHOOL": "Reason for Drop Out From School",
"REASON_FOR_DROPOUT_FROM_SCHOOL": "Reason for dropout from school",
"SCHOOL_INACCESSIBLE": "School inaccessible",
"FINANCIAL_CONSTRAINTS": "Financial Constraints",
"LACK_OF_INTEREST": "Lack of Interest",
Expand Down Expand Up @@ -510,7 +516,8 @@
"ENTER_VALID_EMAIL": "Enter valid Email",
"ENTER_VALID_YEAR": "Enter valid Year",
"MUST_BE_LESS_THAN": "{{fieldname}} must be less than {{maxLength}}",
"MUST_BE_GREATER_THAN": "{{fieldname}} must be greater than {{minLength}}"
"MUST_BE_GREATER_THAN": "{{fieldname}} must be greater than {{minLength}}",
"ENTER_VALID_CENTER_NAME": "Enter valid center name"
},
"COURSE_PLANNER": {
"COURSE_PLANNER": "Course Plan",
Expand All @@ -528,7 +535,22 @@
"SUBMITTED_ON": "Submitted On",
"CORRECT_ANSWER": "correct answers",
"NO_DATA_FOUND": "No data found",
"SEARCH_STUDENT": "search student",
"NO_ASSESSMENTS_FOUND": "No assessments found"
"SEARCH_STUDENT": "Search student",
"NO_ASSESSMENTS_FOUND": "No assessments found",
"ASSESSMENT_STATUS": "Assessment Status",
"NOT_STARTED": "Not Started",
"IN_PROGRESS": "In Progress",
"COMPLETED": "Completed",
"MARKS_OBTAINED": "Marks Obtained",
"OVERALL_SCORE": "Overall Score",
"ASSESSMENT_NOT_STARTED_YET": "Assessment not started yet",
"NUMBER_OUT_OF_COMPLETED": "{{completedCount}} out of {{totalCount}} completed"
},
"BOARD_ENROLMENT": {
"BOARD_ENROLLMENT": "Board Enrollment",
"BOARD_SELECTION": "Board Selection",
"SUBJECTS_SELECTION": "Subjects Selection",
"REGISTRATION_COMPLETED": "Registration Completed",
"DROPPED_OUT": " Dropped Out"
}
}
8 changes: 8 additions & 0 deletions src/assets/images/Board.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit a7c75c6

Please sign in to comment.