From cc8274cf806333f344dac62d29061ef666a14797 Mon Sep 17 00:00:00 2001 From: Sagar Takle Date: Tue, 25 Apr 2023 12:34:59 +0000 Subject: [PATCH] Module not found error --- .../src/pages/admin/facilitator/Table.js | 2 +- apps/front-end/src/routes/guestRoutes.js | 4 +- lib/common-lib/src/index.tsx | 23 +- lib/common-lib/src/services/Auth.ts | 22 -- .../src/services/assessmentRegistryService.js | 175 ---------- .../src/services/attendanceRegistryService.js | 108 ------- .../src/services/authRegistryService.js | 19 ++ .../src/services/classRegistryService.js | 121 ------- .../src/services/commentRegistryService.js | 92 ------ .../src/services/configApiRegistryService.js | 54 ---- .../services/facilitatorRegistryService.js | 17 + .../src/services/likeRegistryService.js | 111 ------- .../src/services/questionRegistryService.js | 86 ----- .../src/services/studentRegistryService.js | 100 ------ .../src/services/teacherRegistryService.js | 107 ------- .../src/services/worksheetRegistryService.js | 144 --------- modules/auth/src/pages/Login.js | 298 ++---------------- modules/facilitator/src/App.js | 12 +- scripts/pack-prod-build.sh | 1 - 19 files changed, 63 insertions(+), 1433 deletions(-) delete mode 100644 lib/common-lib/src/services/Auth.ts delete mode 100644 lib/common-lib/src/services/assessmentRegistryService.js delete mode 100644 lib/common-lib/src/services/attendanceRegistryService.js create mode 100644 lib/common-lib/src/services/authRegistryService.js delete mode 100644 lib/common-lib/src/services/classRegistryService.js delete mode 100644 lib/common-lib/src/services/commentRegistryService.js delete mode 100644 lib/common-lib/src/services/configApiRegistryService.js delete mode 100644 lib/common-lib/src/services/likeRegistryService.js delete mode 100644 lib/common-lib/src/services/questionRegistryService.js delete mode 100644 lib/common-lib/src/services/studentRegistryService.js delete mode 100644 lib/common-lib/src/services/teacherRegistryService.js delete mode 100644 lib/common-lib/src/services/worksheetRegistryService.js diff --git a/apps/front-end/src/pages/admin/facilitator/Table.js b/apps/front-end/src/pages/admin/facilitator/Table.js index 743848a79..7b5f97dee 100644 --- a/apps/front-end/src/pages/admin/facilitator/Table.js +++ b/apps/front-end/src/pages/admin/facilitator/Table.js @@ -111,7 +111,7 @@ function Table() { - + { - const params = new URLSearchParams() - params.append('client_id', 'registry-frontend') - params.append('username', username) - params.append('password', password) - params.append('grant_type', 'password') - - const config = { - headers: { - 'Content-Type': 'application/x-www-form-urlencoded', - 'Access-Control-Allow-Origin': '*' - } - } - - return axios.post(authUrl, params, config).catch((e) => e) -} diff --git a/lib/common-lib/src/services/assessmentRegistryService.js b/lib/common-lib/src/services/assessmentRegistryService.js deleted file mode 100644 index 406776e6a..000000000 --- a/lib/common-lib/src/services/assessmentRegistryService.js +++ /dev/null @@ -1,175 +0,0 @@ -import { get, post } from './RestClient' -import manifest from '../manifest.json' -import mapInterfaceData from './mapInterfaceData' -const defaultAdapter = 'diksha' - -const interfaceData = { - id: 'groupId', - schoolId: 'schoolId', - type: 'type', - name: 'name', - section: 'section', - status: 'status', - image: 'image', - mergeParameterWithValue: { - title: 'name' - }, - mergeParameterWithDefaultValue: { - icon: 'calendar', - route: '/classes/:id' - } -} - -export const getAllQuestions = async (filter, request) => { - const questionList = await post( - 'https://vdn.diksha.gov.in/action/composite/v3/search', - { - request: { - filters: { - objectType: 'Question', - status: ['Live'], - ...filter - }, - ...request - } - } - ) - - if (questionList.data && questionList?.data?.result.count > 0) { - return getQuestionByIds(questionList?.data?.result?.Question, 'identifier') - } else { - return [] - } -} - -export const getQuestionByIds = (questions, subParam) => { - const data = questions.map( - async (question) => - await readQuestion(subParam ? question[subParam] : question) - ) - return Promise.all(data).then((values) => values) -} - -const readQuestion = async (questionId) => { - const question = await get( - `https://vdn.diksha.gov.in/action/question/v1/read/${questionId}`, - { - params: { - fields: - 'body,instructions,primaryCategory,mimeType,qType,answer,responseDeclaration,interactionTypes,interactions,name,solutions,editorState,media,name,board,medium,gradeLevel,subject,topic,learningOutcome,marks,bloomsLevel,author,copyright,license' - } - } - ) - if (question.data) { - const { editorState, subject, topic, gradeLevel, qType, identifier } = - question.data.result.question - return { - ...editorState, - subject, - topic, - class: gradeLevel, - qType, - questionId: identifier - } - } else { - return [] - } -} - -export const getSubjectsList = async (params = {}, header = {}) => { - const headers = { - ...header, - Authorization: 'Bearer ' + localStorage.getItem('token') - } - const adapter = params.adapter ? params.adapter : defaultAdapter - const result = await get( - `${manifest.api_url}/question/${adapter}/subjectlist`, - params, - { - headers - } - ) - - if (result.data && result.data.data) { - return result.data.data.sort() - } else { - return [] - } -} - -export const getCompetenciesList = async (params = {}, header = {}) => { - const headers = { - ...header, - Authorization: 'Bearer ' + localStorage.getItem('token') - } - const adapter = params.adapter ? params.adapter : defaultAdapter - const result = await get( - `${manifest.api_url}/question/${adapter}/competencieslist`, - { - params, - headers - } - ) - - if (result.data && result.data.data) { - return result.data.data.sort() - } else { - return [] - } -} - -export const createUpdateAssessment = async (params = {}, header = {}) => { - const headers = { - ...header, - Authorization: 'Bearer ' + localStorage.getItem('token') - } - const result = await post(`${manifest.api_url}/trackassessment`, params, { - headers - }) - - if (result.data && result.data.data) { - return result.data.data - } else { - return {} - } -} - -export const getAssessmentDetails = async (params = {}, header = {}) => { - const headers = { - ...header, - Authorization: 'Bearer ' + localStorage.getItem('token') - } - const result = await get(`${manifest.api_url}/trackassessment/${params}`, { - headers - }) - - if (result.data && result.data.data) { - return result.data.data - } else { - return {} - } -} - -export const getAttendanceDetailsByClass = async ( - groupId, - params = {}, - header = {} -) => { - const headers = { - ...header, - Authorization: 'Bearer ' + localStorage.getItem('token') - } - const result = await get( - `${manifest.api_url}/attendance/${groupId}/studentdetails`, - { - params, - headers - } - ) - - if (result.data && result.data.data) { - return result.data.data.sort() - } else { - return [] - } -} diff --git a/lib/common-lib/src/services/attendanceRegistryService.js b/lib/common-lib/src/services/attendanceRegistryService.js deleted file mode 100644 index 0e1504ad5..000000000 --- a/lib/common-lib/src/services/attendanceRegistryService.js +++ /dev/null @@ -1,108 +0,0 @@ -import { get, post, update as coreUpdate } from './RestClient' -import mapInterfaceData from './mapInterfaceData' -import manifest from '../manifest.json' - -const interfaceData = { - id: 'attendanceId', - schoolId: 'schoolId', - userType: 'userType', - studentId: 'userId', - topicId: 'topicId', - eventId: 'eventId', - attendance: 'attendance', - date: 'attendanceDate', - classId: 'groupId', - teacherId: 'teacherId', - admissionNo: 'admissionNo', - remark: 'remark', - latitude: 'latitude', - longitude: 'longitude', - image: 'image', - updatedAt: 'updatedAt' -} - -let only = Object.keys(interfaceData) - -export const getAll = async (params = {}, header = {}) => { - let headers = { - ...header, - Authorization: 'Bearer ' + localStorage.getItem('token') - } - - const result = await get(manifest.api_url + '/attendance', { - params: { ...params }, - headers - }) - if (result.data.data) { - return result.data.data.map((e) => mapInterfaceData(e, interfaceData)) - } else { - return [] - } -} - -export const create = async (data, headers = {}) => { - let header = { - ...headers, - Authorization: 'Bearer ' + localStorage.getItem('token') - } - let newInterfaceData = interfaceData - newInterfaceData = { - ...interfaceData, - removeParameter: headers?.removeParameter ? headers?.removeParameter : [], - onlyParameter: headers?.onlyParameter ? headers?.onlyParameter : only - } - let newData = mapInterfaceData(data, newInterfaceData, true) - const result = await post(manifest.api_url + '/attendance', newData, { - headers: header - }) - if (result.data) { - let { Attendance } = result.data?.data?.result - return Attendance - } else { - return false - } -} - -export const update = async (data = {}, headers = {}) => { - let header = { - ...headers, - Authorization: 'Bearer ' + localStorage.getItem('token') - } - let newInterfaceData = interfaceData - newInterfaceData = { - ...interfaceData, - removeParameter: headers?.removeParameter ? headers?.removeParameter : [], - onlyParameter: headers?.onlyParameter ? headers?.onlyParameter : only - } - let newData = mapInterfaceData(data, newInterfaceData, true) - - const result = await coreUpdate( - manifest.api_url + '/attendance/' + data.id, - newData, - { - headers: header - } - ) - if (result.data) { - return result - } else { - return {} - } -} - -export const multipal = async (data = {}, header = {}) => { - let headers = { - ...header, - Authorization: 'Bearer ' + localStorage.getItem('token') - } - const result = await post( - manifest.api_url + '/attendance/bulkAttendance', - data, - { headers } - ) - if (result.data) { - return result - } else { - return {} - } -} diff --git a/lib/common-lib/src/services/authRegistryService.js b/lib/common-lib/src/services/authRegistryService.js new file mode 100644 index 000000000..505d5d676 --- /dev/null +++ b/lib/common-lib/src/services/authRegistryService.js @@ -0,0 +1,19 @@ +import { get, post, update as coreUpdate } from './RestClient' +import manifest from '../manifest.json' +import mapInterfaceData from './mapInterfaceData' + +export const login = async (params = {}, header = {}) => { + let headers = { + ...header + } + const result = await post(`${manifest.api_url}/users/login`, params, { + params, + headers + }) + + if (result?.data) { + return result?.data + } else { + return {} + } +} diff --git a/lib/common-lib/src/services/classRegistryService.js b/lib/common-lib/src/services/classRegistryService.js deleted file mode 100644 index 6c599abe7..000000000 --- a/lib/common-lib/src/services/classRegistryService.js +++ /dev/null @@ -1,121 +0,0 @@ -import { get, post, update as coreUpdate } from './RestClient' -import mapInterfaceData from './mapInterfaceData' -import manifest from '../manifest.json' - -const interfaceData = { - id: 'groupId', - schoolId: 'schoolId', - type: 'type', - name: 'name', - section: 'section', - status: 'status', - image: 'image', - mergeParameterWithValue: { - title: 'name' - }, - mergeParameterWithDefaultValue: { - icon: 'calendar', - route: '/classes/:id' - } -} - -export const getAll = async (params = {}, header = {}) => { - let headers = { - ...header, - Authorization: 'Bearer ' + localStorage.getItem('token') - } - const result = await get( - `${manifest.api_url}/group/participant/${params.teacherId}?role=Teacher`, - { - ...params, - headers - } - ) - if (result.data) { - const data = result.data.data.map((e) => mapInterfaceData(e, interfaceData)) - return data.sort(function (a, b) { - return a.name - b.name - }) - } else { - return [] - } -} - -export const update = async (data = {}, header = {}) => { - let newInterfaceData = interfaceData - let headers = { - ...header, - Authorization: 'Bearer ' + localStorage.getItem('token') - } - if (headers?.removeParameter || headers?.onlyParameter) { - newInterfaceData = { - ...interfaceData, - removeParameter: headers?.removeParameter ? headers?.removeParameter : [], - onlyParameter: headers?.onlyParameter ? headers?.onlyParameter : [] - } - } - let newData = mapInterfaceData(data, newInterfaceData, true) - const result = await coreUpdate( - manifest.api_url + '/group/' + data.id, - newData, - { - headers: headers ? headers : {} - } - ) - if (result?.data) { - return result - } else { - return {} - } -} - -export const updateImage = async (data = {}, header = {}) => { - let headers = { - ...header, - Authorization: 'Bearer ' + localStorage.getItem('token') - } - const result = await coreUpdate( - manifest.api_url + '/group/' + data.id, - data, - { - headers: headers ? headers : {} - } - ) - if (result?.data) { - return result - } else { - return {} - } -} - -export const getAllData = async (params = {}, header = {}) => { - let headers = { - ...header, - Authorization: 'Bearer ' + localStorage.getItem('token') - } - const result = await post(`${manifest.api_url}/group/search`, params, { - headers - }) - - if (result.data) { - const data = result.data.data.map((e) => mapInterfaceData(e, interfaceData)) - return _.sortBy(data, 'name') - } else { - return [] - } -} - -export const getOne = async (filters = {}, header = {}) => { - let headers = { - ...header, - Authorization: 'Bearer ' + localStorage.getItem('token') - } - const result = await get(`${manifest.api_url}/group/${filters.id}`, { - headers - }) - if (result.data) { - return mapInterfaceData(result.data.data, interfaceData) - } else { - return {} - } -} diff --git a/lib/common-lib/src/services/commentRegistryService.js b/lib/common-lib/src/services/commentRegistryService.js deleted file mode 100644 index 127ad0209..000000000 --- a/lib/common-lib/src/services/commentRegistryService.js +++ /dev/null @@ -1,92 +0,0 @@ -import { get, post, update as updateRequest } from './RestClient' -import mapInterfaceData from './mapInterfaceData' -import manifest from '../manifest.json' -import * as teacherRegistryService from './teacherRegistryService' - -const interfaceData = { - id: 'commentId', - contextId: 'contextId', - context: 'context', - userId: 'userId', - comment: 'comment', - parentId: 'parentId', - status: 'status', - privacy: 'privacy' -} - -let commentEntityAttributes = Object.keys(interfaceData) - -export const getAll = async ({ limit, ...params } = {}, header = {}) => { - const result = await post( - manifest.api_url + '/comment/search', - { filters: params, limit: limit }, - { - headers: { - Authorization: 'Bearer ' + localStorage.getItem('token'), - ...header - } - } - ) - if (result.data.data) { - const data = result.data.data.map((e) => mapInterfaceData(e, interfaceData)) - - return data - } else { - return [] - } -} - -export const create = async ( - data, - { removeParameter, onlyParameter, ...headers } = {} -) => { - let newInterfaceData = interfaceData - newInterfaceData = { - ...interfaceData, - removeParameter: removeParameter ? removeParameter : [], - onlyParameter: onlyParameter ? onlyParameter : commentEntityAttributes - } - let newData = mapInterfaceData(data, newInterfaceData, true) - const result = await post(manifest.api_url + '/comment', newData, { - headers: { - Authorization: 'Bearer ' + localStorage.getItem('token'), - ...headers - } - }) - if (result.data) { - let { Comment } = result.data?.data?.result - return Comment - } else { - return false - } -} - -export const update = async ( - data = {}, - { removeParameter, onlyParameter, ...headers } = {} -) => { - let newInterfaceData = interfaceData - let header = { - ...headers, - Authorization: 'Bearer ' + localStorage.getItem('token') - } - newInterfaceData = { - ...interfaceData, - removeParameter: removeParameter ? removeParameter : [], - onlyParameter: onlyParameter ? onlyParameter : commentEntityAttributes - } - let newData = mapInterfaceData(data, newInterfaceData, true) - - const result = await updateRequest( - manifest.api_url + '/comment/' + data.id, - newData, - { - headers: header - } - ) - if (result.data) { - return result - } else { - return {} - } -} diff --git a/lib/common-lib/src/services/configApiRegistryService.js b/lib/common-lib/src/services/configApiRegistryService.js deleted file mode 100644 index ac0e90cb8..000000000 --- a/lib/common-lib/src/services/configApiRegistryService.js +++ /dev/null @@ -1,54 +0,0 @@ -import { get, post, update as coreUpdate } from './RestClient' -import mapInterfaceData from './mapInterfaceData' -import manifest from '../manifest.json' - -const interfaceData = { - id: 'configId', - module: 'module', - key: 'key', - value: 'value', - canOverride: 'canOverride', - overrideBy: 'overrideBy', - isPublic: 'isPublic' -} - -export const getApiConfig = async (modules = []) => { - const arr = await getAll() - let object = {} - arr.forEach((e) => { - object = { ...object, [e.key]: e.value } - }) - return object -} - -export const getAll = async (params = {}, header = {}) => { - let headers = { - ...header, - Authorization: 'Bearer ' + localStorage.getItem('token') - } - const result = await get(`${manifest.api_url}/config/{module}/all`, { - ...params, - headers - }) - if (result.data) { - const data = result.data.data.map((e) => mapInterfaceData(e, interfaceData)) - return _.sortBy(data, 'name') - } else { - return [] - } -} - -export const getOne = async (filters = {}, header = {}) => { - let headers = { - ...header, - Authorization: 'Bearer ' + localStorage.getItem('token') - } - const result = await get(`${manifest.api_url}/config/${filters.id}`, { - headers - }) - if (result.data) { - return mapInterfaceData(result.data.data, interfaceData) - } else { - return {} - } -} diff --git a/lib/common-lib/src/services/facilitatorRegistryService.js b/lib/common-lib/src/services/facilitatorRegistryService.js index 773aa370b..6bb4e85c8 100644 --- a/lib/common-lib/src/services/facilitatorRegistryService.js +++ b/lib/common-lib/src/services/facilitatorRegistryService.js @@ -95,6 +95,23 @@ export const getOne = async (filters = {}, header = {}) => { } } +export const getInfo = async (filters = {}, header = {}) => { + let headers = { + Authorization: 'Bearer ' + localStorage.getItem('token'), + ...header + } + const result = await get(`${manifest.api_url}/users/ip_user_info`, { + headers + }) + + if (result?.data?.data) { + let resultStudent = mapInterfaceData(result.data.data, interfaceData) + return resultStudent + } else { + return {} + } +} + export const create = async (data, headers = {}) => { let header = { ...headers, diff --git a/lib/common-lib/src/services/likeRegistryService.js b/lib/common-lib/src/services/likeRegistryService.js deleted file mode 100644 index 60bb25437..000000000 --- a/lib/common-lib/src/services/likeRegistryService.js +++ /dev/null @@ -1,111 +0,0 @@ -import { - get, - post, - update as updateRequest, - distory as distoryRequest -} from './RestClient' -import mapInterfaceData from './mapInterfaceData' -import manifest from '../manifest.json' - -const interfaceData = { - id: 'likeId', - contextId: 'contextId', - context: 'context', - userId: 'userId', - type: 'type' -} - -let commentEntityAttributes = Object.keys(interfaceData) - -export const getAll = async ({ limit, ...params } = {}, header = {}) => { - const result = await post( - manifest.api_url + '/like/search', - { filters: params, limit: limit }, - { - headers: { - Authorization: 'Bearer ' + localStorage.getItem('token'), - ...header - } - } - ) - if (result.data.data) { - return result.data.data.map((e) => mapInterfaceData(e, interfaceData)) - } else { - return [] - } -} - -export const create = async ( - data, - { removeParameter, onlyParameter, ...headers } = {} -) => { - let newInterfaceData = interfaceData - let header = { - ...headers, - Authorization: 'Bearer ' + localStorage.getItem('token') - } - newInterfaceData = { - ...interfaceData, - removeParameter: removeParameter ? removeParameter : [], - onlyParameter: onlyParameter ? onlyParameter : commentEntityAttributes - } - let newData = mapInterfaceData(data, newInterfaceData, true) - const result = await post(manifest.api_url + '/like', newData, { - headers: header - }) - if (result.data) { - let { Like } = result.data?.data?.result - return Like - } else { - return false - } -} - -export const update = async ( - data = {}, - { removeParameter, onlyParameter, ...headers } = {} -) => { - let newInterfaceData = interfaceData - let header = { - ...headers, - Authorization: 'Bearer ' + localStorage.getItem('token') - } - newInterfaceData = { - ...interfaceData, - removeParameter: removeParameter ? removeParameter : [], - onlyParameter: onlyParameter ? onlyParameter : only - } - let newData = mapInterfaceData(data, newInterfaceData, true) - - const result = await updateRequest( - manifest.api_url + '/like/' + data.id, - newData, - { - headers: header - } - ) - if (result.data) { - return result - } else { - return {} - } -} - -export const distory = async (data = {}, headers = {}) => { - let header = { - ...headers, - Authorization: 'Bearer ' + localStorage.getItem('token') - } - const result = await distoryRequest( - manifest.api_url + '/like/' + data.id, - data, - { - headers: header - } - ) - if (result.data) { - return result - } else { - return {} - } -} diff --git a/lib/common-lib/src/services/questionRegistryService.js b/lib/common-lib/src/services/questionRegistryService.js deleted file mode 100644 index e015fc095..000000000 --- a/lib/common-lib/src/services/questionRegistryService.js +++ /dev/null @@ -1,86 +0,0 @@ -import { get, post } from './RestClient' -import mapInterfaceData from './mapInterfaceData' -import manifest from '../manifest.json' - -const interfaceData = { - questionId: 'questionId', - body: 'body', - question: 'body', - options: 'options', - type: 'type' -} - -export const getAllQuestions = async (params = {}, header = {}) => { - let headers = { - Authorization: 'Bearer ' + localStorage.getItem('token'), - ContentType: 'application/json', - Accept: 'application/json', - ...header - } - const result = await get( - `${manifest.api_url}/question/${params?.adapter}/search?server=dev`, - { - params: params, - headers - } - ) - if (result?.data?.data && result.data.data.length) { - return result.data.data.map((e) => mapInterfaceData(e, interfaceData)) - } - return [] -} -export const getAll = async (filter, request) => { - const questionList = await post( - 'https://vdn.diksha.gov.in/action/composite/v3/search', - { - request: { - filters: { - objectType: 'Question', - status: ['Live'], - ...filter - }, - ...request - } - } - ) - - if (questionList.data && questionList?.data?.result.count > 0) { - return getQuestionByIds(questionList?.data?.result?.Question, 'identifier') - } else { - return [] - } -} - -export const getQuestionByIds = (questions, subParam) => { - const data = questions.map( - async (question) => - await readQuestion(subParam ? question[subParam] : question) - ) - return Promise.all(data).then((values) => values) -} - -const readQuestion = async (questionId) => { - const question = await get( - `https://vdn.diksha.gov.in/action/question/v1/read/${questionId}`, - { - params: { - fields: - 'body,instructions,primaryCategory,mimeType,qType,answer,responseDeclaration,interactionTypes,interactions,name,solutions,editorState,media,name,board,medium,gradeLevel,subject,topic,learningOutcome,marks,bloomsLevel,author,copyright,license' - } - } - ) - if (question.data) { - const { editorState, subject, topic, gradeLevel, qType, identifier } = - question.data.result.question - return { - ...editorState, - subject, - topic, - class: gradeLevel, - qType, - questionId: identifier - } - } else { - return [] - } -} diff --git a/lib/common-lib/src/services/studentRegistryService.js b/lib/common-lib/src/services/studentRegistryService.js deleted file mode 100644 index aa6ae4a52..000000000 --- a/lib/common-lib/src/services/studentRegistryService.js +++ /dev/null @@ -1,100 +0,0 @@ -import { get, post, update as coreUpdate } from './RestClient' -import mapInterfaceData from './mapInterfaceData' -import manifest from '../manifest.json' - -const interfaceData = { - id: 'studentId', - fullName: 'firstName', - firstName: 'firstName', - fathersName: 'fatherFirstName', - phoneNumber: 'studentPhoneNumber', - lastName: 'lastName', - aadhaar: 'aadhaar', - classId: 'classId', - schoolId: 'schoolId', - refId: 'studentRefId', - birthDate: 'birthDate', - bloodGroup: 'bloodGroup', - bpl: 'bpl', - height: 'height', - weight: 'weight', - homeless: 'homeless', - iscwsn: 'iscwsn', - migrant: 'migrant', - religion: 'religion', - singleGirl: 'singleGirl', - socialCategory: 'socialCategory', - admissionNo: 'refId1', - currentClassID: 'classId', - email: 'studentEmail', - address: 'address', - gender: 'gender' -} - -export const getAll = async (params = {}, header = {}) => { - let headers = { - Authorization: 'Bearer ' + localStorage.getItem('token'), - ContentType: 'application/json', - Accept: 'application/json', - ...header - } - const result = await get( - `${manifest.api_url}/group/${params?.classId}/participants?role=Student`, - { - headers - } - ) - if (result?.data?.data && result.data.data.length) { - const data = result.data.data.map((e) => mapInterfaceData(e, interfaceData)) - return _.sortBy(data, 'admissionNo') - } - return [] -} - -export const getOne = async (filters = {}, header = {}) => { - let headers = { - ...header, - Authorization: 'Bearer ' + localStorage.getItem('token') - } - const result = await get(manifest.api_url + '/student/' + filters.id, { - headers - }) - if (result?.data?.data) { - let resultStudent = mapInterfaceData(result.data.data, interfaceData) - resultStudent.id = resultStudent.id?.startsWith('1-') - ? resultStudent.id?.replace('1-', '') - : resultStudent.id - return resultStudent - } else { - return {} - } -} - -export const update = async (data = {}, headers = {}) => { - let newInterfaceData = interfaceData - if (headers?.removeParameter || headers?.onlyParameter) { - newInterfaceData = { - ...interfaceData, - removeParameter: headers?.removeParameter ? headers?.removeParameter : [], - onlyParameter: headers?.onlyParameter ? headers?.onlyParameter : [] - } - } - let newData = mapInterfaceData(data, newInterfaceData, true) - - const result = await coreUpdate( - manifest.api_url + '/student/' + data.id, - newData, - { - headers: headers?.headers ? headers?.headers : {} - } - ) - if (result?.data) { - return result - } else { - return {} - } -} - -export const setDefaultValue = async (data) => { - return data.map((e) => mapInterfaceData(e, interfaceData)) -} diff --git a/lib/common-lib/src/services/teacherRegistryService.js b/lib/common-lib/src/services/teacherRegistryService.js deleted file mode 100644 index 61210195e..000000000 --- a/lib/common-lib/src/services/teacherRegistryService.js +++ /dev/null @@ -1,107 +0,0 @@ -import mapInterfaceData from './mapInterfaceData' -import manifest from '../manifest.json' -import { get, post, update as updateRequest } from './RestClient' - -const interfaceData = { - id: 'teacherId', - fullName: 'fullName', - firstName: 'firstName', - lastName: 'lastName', - email: 'email', - aadhaar: 'aadhaar', - cadre: 'cadre', - compSkills: 'compSkills', - designation: 'designation', - image: 'image', - workingStatus: 'workingStatus', - birthDate: 'birthDate', - block: 'block', - bloodGroup: 'bloodGroup', - createdAt: 'createdAt', - disability: 'disability', - district: 'district', - employmentType: 'employmentType', - gender: 'gender', - homeDistance: 'homeDistance', - joiningDate: 'joiningDate', - maritalStatus: 'maritalStatus', - middleName: 'middleName', - phoneNumber: 'phoneNumber', - pincode: 'pincode', - profQualification: 'profQualification', - refId1: 'refId1', - refId2: 'refId2', - refId3: 'refId3', - religion: 'religion', - reportsTo: 'reportsTo', - retirementDate: 'retirementDate', - schoolId: 'schoolId', - socialCategory: 'socialCategory', - stateId: 'stateId', - status: 'status', - subjectIds: 'subjectIds', - teacherAddress: 'teacherAddress', - updatedAt: 'updatedAt', - village: 'village', - mergeParameterWithValue: { - title: 'fullName' - } -} - -export const getAll = async (params = {}, header = {}) => { - let headers = { - Authorization: 'Bearer ' + localStorage.getItem('token'), - ...header - } - - const result = await post(`${manifest.api_url}/teacher/search`, params, { - headers - }) - if (result.data) { - return result.data.map((e) => mapInterfaceData(e, interfaceData)) - } else { - return [] - } -} - -export const getOne = async (params = {}, header = {}) => { - let headers = { - Authorization: 'Bearer ' + localStorage.getItem('token'), - ...header - } - - const result = await get(`${manifest.api_url}/teacher`, { - params, - headers - }).catch((error) => error) - if (result.data) { - return mapInterfaceData(result.data.data[0], interfaceData) - } else { - return {} - } -} - -export const update = async (data = {}, headers = {}) => { - let newInterfaceData = interfaceData - if (headers?.removeParameter || headers?.onlyParameter) { - newInterfaceData = { - ...interfaceData, - removeParameter: headers?.removeParameter ? headers?.removeParameter : [], - onlyParameter: headers?.onlyParameter ? headers?.onlyParameter : [] - } - } - let newData = mapInterfaceData(data, newInterfaceData, true) - - const result = await updateRequest( - manifest.api_url + '/teacher/' + data.id, - newData, - { - headers: headers?.headers ? headers?.headers : {} - } - ) - if (result?.data) { - return result - } else { - return {} - } -} diff --git a/lib/common-lib/src/services/worksheetRegistryService.js b/lib/common-lib/src/services/worksheetRegistryService.js deleted file mode 100644 index ef385048b..000000000 --- a/lib/common-lib/src/services/worksheetRegistryService.js +++ /dev/null @@ -1,144 +0,0 @@ -import mapInterfaceData from './mapInterfaceData' -import manifest from '../manifest.json' -import { get, post, update as coreUpdate } from './RestClient' -import * as likeRegistryService from './likeRegistryService' -import * as commentRegistryService from './commentRegistryService' - -const interfaceData = { - id: 'worksheetId', - name: 'name', - state: 'state', - subject: 'subject', - grade: 'grade', - level: 'level', - topic: 'topic', - instructions: 'instructions', - feedback: 'feedback', - hints: 'hints', - navigationMode: 'navigationMode', - timeLimits: 'timeLimits', - showHints: 'showHints', - questions: 'questions', - questionSets: 'questionSets', - outcomeDeclaration: 'outcomeDeclaration', - outcomeProcessing: 'outcomeProcessing', - questionSetType: 'questionSetType', - criteria: 'criteria', - usedFor: 'usedFor', - description: 'purpose', - visibility: 'visibility', - qumlVersion: 'qumlVersion' -} - -let only = Object.keys(interfaceData) - -export const getAll = async ({ limit, ...params } = {}, header = {}) => { - let headers = { - ...header, - headers: { - ...header.header, - Authorization: 'Bearer ' + localStorage.getItem('token') - } - } - const result = await post( - manifest.api_url + '/worksheet/search', - { filters: params, limit: limit }, - { - headers: headers?.headers ? headers?.headers : {} - } - ) - - if (result.data.data) { - return result.data.data.map((e) => mapInterfaceData(e, interfaceData)) - } else { - return [] - } -} - -export const getOne = async (filters = {}, header = {}) => { - let headers = { - ...header, - Authorization: 'Bearer ' + localStorage.getItem('token') - } - try { - const result = await get(manifest.api_url + '/worksheet/' + filters.id, { - headers - }) - if (result?.data?.data) { - let mapResult = mapInterfaceData(result.data.data, interfaceData) - mapResult.id = mapResult.id?.startsWith('1-') - ? mapResult.id?.replace('1-', '') - : mapResult.id - return mapResult - } else { - return {} - } - } catch { - return {} - } -} - -export const create = async (data, header = {}) => { - let headers = { - ...header, - headers: { - ...header.header, - Authorization: 'Bearer ' + localStorage.getItem('token') - } - } - let newInterfaceData = interfaceData - newInterfaceData = { - ...interfaceData, - removeParameter: headers?.removeParameter ? headers?.removeParameter : [], - onlyParameter: headers?.onlyParameter ? headers?.onlyParameter : only - } - let newData = mapInterfaceData(data, newInterfaceData, true) - const result = await post(manifest.api_url + '/worksheet', newData, { - headers: headers?.headers ? headers?.headers : {} - }) - if (result.data) { - let { Worksheet } = result.data?.data?.result - return Worksheet - } else { - return false - } -} - -export const update = async (data = {}, headers = {}) => { - let newInterfaceData = interfaceData - newInterfaceData = { - ...interfaceData, - removeParameter: headers?.removeParameter ? headers?.removeParameter : [], - onlyParameter: headers?.onlyParameter ? headers?.onlyParameter : only - } - let newData = mapInterfaceData(data, newInterfaceData, true) - - const result = await coreUpdate( - manifest.api_url + '/worksheet/' + data.id, - newData, - { - headers: headers?.headers ? headers?.headers : {} - } - ) - if (result.data) { - return result - } else { - return {} - } -} - -export const getWorksheetLikes = async (id) => { - return await likeRegistryService.getAll({ - contextId: { eq: id }, - context: { eq: 'Worksheet' }, - type: { eq: 'like' } - }) -} - -export const getWorksheetComments = async (id, filter = {}) => { - return await commentRegistryService.getAll({ - contextId: { eq: id }, - context: { eq: 'Worksheet' }, - ...filter - }) -} diff --git a/modules/auth/src/pages/Login.js b/modules/auth/src/pages/Login.js index 600f6ec35..2f7fcf59d 100644 --- a/modules/auth/src/pages/Login.js +++ b/modules/auth/src/pages/Login.js @@ -11,22 +11,19 @@ import { CloseIcon, Center, Stack, - Image, - Text, } from "native-base"; import { - fetchToken, - eventBus, useWindowSize, - teacherRegistryService, + authRegistryService, BodyMedium, - Heading, Subtitle, H3, t, Caption, BodyLarge, + facilitatorRegistryService, } from "@shiksha/common-lib"; +import { useNavigate } from "react-router-dom"; const styles = { box: { @@ -35,240 +32,12 @@ const styles = { }, }; -export function Login() { - const [credentials, setCredentials] = useState(); - const [errors, setErrors] = React.useState({}); - const [width, Height] = useWindowSize(); - - const validate = () => { - let arr = {}; - if ( - typeof credentials?.username === "undefined" || - credentials?.username === "" - ) { - arr = { ...arr, username: t("USERNAME_IS_REQUIRED") }; - } - - if ( - typeof credentials?.password === "undefined" || - credentials?.password === "" - ) { - arr = { ...arr, password: t("PASSWORD_IS_REQUIRED") }; - } - - setErrors(arr); - if (arr.username || arr.password) { - return false; - } - return true; - }; - function makeid(length) { - let result = ""; - const characters = - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; - const charactersLength = characters.length; - let counter = 0; - while (counter < length) { - result += characters.charAt(Math.floor(Math.random() * charactersLength)); - counter += 1; - } - return result; - } - - const handleLogin = async () => { - localStorage.setItem("token", makeid(25)); - window.location.reload(); - if (validate()) { - return false; - const result = await fetchToken( - process.env.AUTH_URL, - credentials?.username, - credentials?.password - ); - /* const result = { - data:{ - "access_token": "eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJGRC0yV2pkaVJfQjV3OVZVc1Nsdjh6b21vMmN1ejlHalVSd1hUQzBDU3NZIn0.eyJleHAiOjE2NDYxNjUxMzMsImlhdCI6MTY0NjEyOTEzMywianRpIjoiNGExODhkMjQtODMyNS00M2NkLWE1ODgtMzNlZjA4ZTc4NzU2IiwiaXNzIjoiaHR0cHM6Ly9kZXYtc2hpa3NoYS51bml0ZWZyYW1ld29yay5pby9hdXRoL3JlYWxtcy9zdW5iaXJkLXJjIiwiYXVkIjoiYWNjb3VudCIsInN1YiI6IjViMzRiMGE4LTUyMDktNDFiNi04ZWNhLTMzOWU3YzIwOTkzYSIsInR5cCI6IkJlYXJlciIsImF6cCI6InJlZ2lzdHJ5LWZyb250ZW5kIiwic2Vzc2lvbl9zdGF0ZSI6IjM0ZmE4OTJiLWI4MTMtNDg2Ni1hMmNkLTUzZDBlOTgwNjRlMyIsImFjciI6IjEiLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsiYXR0ZW5kYW5jZS1tYW5hZ2VtZW50Iiwib2ZmbGluZV9hY2Nlc3MiLCJkZWZhdWx0LXJvbGVzLXN1bmJpcmQtcmMiLCJ1bWFfYXV0aG9yaXphdGlvbiJdfSwicmVzb3VyY2VfYWNjZXNzIjp7ImFjY291bnQiOnsicm9sZXMiOlsibWFuYWdlLWFjY291bnQiLCJtYW5hZ2UtYWNjb3VudC1saW5rcyIsInZpZXctcHJvZmlsZSJdfX0sInNjb3BlIjoiZW1haWwgcHJvZmlsZSIsImVtYWlsX3ZlcmlmaWVkIjpmYWxzZSwicHJlZmVycmVkX3VzZXJuYW1lIjoiYXNod2luMkBnbWFpbC5jb20iLCJlbWFpbCI6ImFzaHdpbjJAZ21haWwuY29tIn0.S-YAVlsaiGQ8g8uVVTRdn9gTpA3xL5qh94DSfppuv28qLqCRbw7fmAJtBqK-TGO42vZwZWelOT49LN6znkEncTcvvcMe4iWSm1dU0cOqwn0piQt7lrMQ2RLPYGThPJK98ixHgcieODibWoWLK8tyeb6LJqfyw0gS0UCzxMJQn0R5ABFjRO7tThjBeuNZmP7b03WZIEi7aGQmB3XB9i6Ge9AaQHIUNbz9pCjqdkm0CjNG6qS3pgfX2dKHG1Y2T55ziSHWi5LySFzagAkRvveeh-4tghpxwPHvAXtepGSsOQWkEG8xnZCIyingjOt0snqDt0p1bF4thnTblIaq1LRGaQ" - } - } - */ if (result?.data) { - let token = result.data.access_token; - const resultTeacher = await teacherRegistryService.getOne( - {}, - { Authorization: "Bearer " + token } - ); - - if (resultTeacher) { - let id = resultTeacher.id.replace("1-", ""); - localStorage.setItem("id", id); - localStorage.setItem( - "fullName", - resultTeacher.fullName - ? resultTeacher.fullName - : `${resultTeacher.firstName} ${resultTeacher.lastName}` - ); - localStorage.setItem("firstName", resultTeacher.firstName); - localStorage.setItem("lastName", resultTeacher.lastName); - localStorage.setItem("schoolId", resultTeacher.schoolId); - //window.location.reload(); - - localStorage.setItem("token", token); - eventBus.publish("AUTH", { - eventType: "LOGIN_SUCCESS", - data: { - token: token, - }, - }); - } - } else { - localStorage.removeItem("token"); - setErrors({ alert: t("PLEASE_ENTER_VALID_CREDENTIALS") }); - } - } - }; - - return ( - -
-
- - - {t("SIGN_IN")} - - {t("WELCOME_BACK")} - - - - {"alert" in errors ? ( - - - - - - {errors.alert} - - } - onPress={(e) => setErrors({})} - /> - - - - ) : ( - <> - )} - - - - {t("USERNAME")} - - - setCredentials({ - ...credentials, - username: e.target.value, - }) - } - /> - {"username" in errors ? ( - - {errors.username} - - ) : ( - <> - )} - - - - {t("PASSWORD")} - - - setCredentials({ - ...credentials, - password: e.target.value, - }) - } - /> - {"password" in errors ? ( - - {errors.password} - - ) : ( - <> - )} - - - - {t("FORGOT_PASSWORD")} - - - - {t("DONT_HAVE_AN_ACCOUNT")} - - {t("SIGN_UP")} - - - - -
-
- - ); -} - export default function Page2() { const ref = React.useRef(null); const [width, Height] = useWindowSize(); const [credentials, setCredentials] = useState(); const [errors, setErrors] = React.useState({}); + const navigate = useNavigate(); const validate = () => { let arr = {}; @@ -292,62 +61,37 @@ export default function Page2() { } return true; }; - function makeid(length) { - let result = ""; - const characters = - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; - const charactersLength = characters.length; - let counter = 0; - while (counter < length) { - result += characters.charAt(Math.floor(Math.random() * charactersLength)); - counter += 1; - } - return result; - } const handleLogin = async () => { - localStorage.setItem("token", makeid(25)); - window.location.reload(); if (validate()) { - return false; - const result = await fetchToken( - process.env.AUTH_URL, - credentials?.username, - credentials?.password - ); - /* const result = { - data:{ - "access_token": "eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJGRC0yV2pkaVJfQjV3OVZVc1Nsdjh6b21vMmN1ejlHalVSd1hUQzBDU3NZIn0.eyJleHAiOjE2NDYxNjUxMzMsImlhdCI6MTY0NjEyOTEzMywianRpIjoiNGExODhkMjQtODMyNS00M2NkLWE1ODgtMzNlZjA4ZTc4NzU2IiwiaXNzIjoiaHR0cHM6Ly9kZXYtc2hpa3NoYS51bml0ZWZyYW1ld29yay5pby9hdXRoL3JlYWxtcy9zdW5iaXJkLXJjIiwiYXVkIjoiYWNjb3VudCIsInN1YiI6IjViMzRiMGE4LTUyMDktNDFiNi04ZWNhLTMzOWU3YzIwOTkzYSIsInR5cCI6IkJlYXJlciIsImF6cCI6InJlZ2lzdHJ5LWZyb250ZW5kIiwic2Vzc2lvbl9zdGF0ZSI6IjM0ZmE4OTJiLWI4MTMtNDg2Ni1hMmNkLTUzZDBlOTgwNjRlMyIsImFjciI6IjEiLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsiYXR0ZW5kYW5jZS1tYW5hZ2VtZW50Iiwib2ZmbGluZV9hY2Nlc3MiLCJkZWZhdWx0LXJvbGVzLXN1bmJpcmQtcmMiLCJ1bWFfYXV0aG9yaXphdGlvbiJdfSwicmVzb3VyY2VfYWNjZXNzIjp7ImFjY291bnQiOnsicm9sZXMiOlsibWFuYWdlLWFjY291bnQiLCJtYW5hZ2UtYWNjb3VudC1saW5rcyIsInZpZXctcHJvZmlsZSJdfX0sInNjb3BlIjoiZW1haWwgcHJvZmlsZSIsImVtYWlsX3ZlcmlmaWVkIjpmYWxzZSwicHJlZmVycmVkX3VzZXJuYW1lIjoiYXNod2luMkBnbWFpbC5jb20iLCJlbWFpbCI6ImFzaHdpbjJAZ21haWwuY29tIn0.S-YAVlsaiGQ8g8uVVTRdn9gTpA3xL5qh94DSfppuv28qLqCRbw7fmAJtBqK-TGO42vZwZWelOT49LN6znkEncTcvvcMe4iWSm1dU0cOqwn0piQt7lrMQ2RLPYGThPJK98ixHgcieODibWoWLK8tyeb6LJqfyw0gS0UCzxMJQn0R5ABFjRO7tThjBeuNZmP7b03WZIEi7aGQmB3XB9i6Ge9AaQHIUNbz9pCjqdkm0CjNG6qS3pgfX2dKHG1Y2T55ziSHWi5LySFzagAkRvveeh-4tghpxwPHvAXtepGSsOQWkEG8xnZCIyingjOt0snqDt0p1bF4thnTblIaq1LRGaQ" - } - } - */ if (result?.data) { - let token = result.data.access_token; - const resultTeacher = await teacherRegistryService.getOne( + const result = await authRegistryService.login(credentials); + if (result) { + let token = result.access_token; + const resultTeacher = await facilitatorRegistryService.getInfo( {}, { Authorization: "Bearer " + token } ); - if (resultTeacher) { - let id = resultTeacher.id.replace("1-", ""); + if (resultTeacher.id) { + let id = resultTeacher.id; localStorage.setItem("id", id); localStorage.setItem( "fullName", resultTeacher.fullName ? resultTeacher.fullName - : `${resultTeacher.firstName} ${resultTeacher.lastName}` + : `${resultTeacher.first_name} ${resultTeacher.last_name}` ); - localStorage.setItem("firstName", resultTeacher.firstName); - localStorage.setItem("lastName", resultTeacher.lastName); - localStorage.setItem("schoolId", resultTeacher.schoolId); - //window.location.reload(); - + localStorage.setItem("first_name", resultTeacher.first_name); + localStorage.setItem("last_name", resultTeacher.last_name); localStorage.setItem("token", token); - eventBus.publish("AUTH", { - eventType: "LOGIN_SUCCESS", - data: { - token: token, - }, - }); + // eventBus.publish("AUTH", { + // eventType: "LOGIN_SUCCESS", + // data: { + // token: token, + // }, + // }); + navigate("/"); + navigate(0); } } else { localStorage.removeItem("token"); diff --git a/modules/facilitator/src/App.js b/modules/facilitator/src/App.js index 771ebbecd..90f8259c0 100644 --- a/modules/facilitator/src/App.js +++ b/modules/facilitator/src/App.js @@ -4,20 +4,10 @@ import { BrowserRouter as Router, Route, Routes } from "react-router-dom"; import "./App.css"; import { extendTheme, NativeBaseProvider } from "native-base"; import { DEFAULT_THEME, AppShell } from "@shiksha/common-lib"; -import Sample from "pages/Sample"; function App() { const theme = extendTheme(DEFAULT_THEME); - const routes = [ - { - path: "/", - component: Sample, - }, - { - path: "*", - component: Sample, - }, - ]; + const routes = []; const LoginComponent = React.lazy(() => import("auth/Login")); return ( diff --git a/scripts/pack-prod-build.sh b/scripts/pack-prod-build.sh index d33ae18a2..e166837dd 100755 --- a/scripts/pack-prod-build.sh +++ b/scripts/pack-prod-build.sh @@ -2,7 +2,6 @@ rm -rf prod-build mkdir prod-build mkdir prod-build/modules -mkdir prod-build/admin find modules \( ! -path lib/common-ui -o ! -path apps/admin \) -type d -maxdepth 1 -mindepth 1 -exec bash -c ' for f do # echo $f