From 24932b41139a6b1b775da9cf9dcb5fc2bf9cdc0f Mon Sep 17 00:00:00 2001 From: karthik Date: Fri, 15 Nov 2024 04:39:46 +0000 Subject: [PATCH] sprint-bug-fixing (#4) General pull & push Co-authored-by: Karthik Sammy <10769@intelizign.com> Reviewed-on: https://gitea.wizdomwaves.in/WizdomWaves/TedQuMobileApp/pulls/4 --- android/app/src/main/AndroidManifest.xml | 1 + package-lock.json | 4 ++-- package.json | 2 +- src/api/license.api.tsx | 2 +- src/constants/Constants.tsx | 2 +- src/screens/SchoolCalendar/SchoolCalendar.tsx | 6 +++--- src/screens/Student/StudentView.tsx | 2 +- yarn.lock | 15 +++++---------- 8 files changed, 15 insertions(+), 19 deletions(-) diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 3c7ad4c..1029795 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -10,6 +10,7 @@ + diff --git a/package-lock.json b/package-lock.json index ddb6c63..22f659e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -54,7 +54,7 @@ "react": "18.2.0", "react-native": "0.73.5", "react-native-app-intro-slider": "^4.0.4", - "react-native-artag-module": "file:../06_Installables/react-native-artag-module-0.1.4.tgz", + "react-native-artag-module": "file:../Installables/react-native-artag-module-0.1.4.tgz", "react-native-audio-recorder-player": "^3.6.11", "react-native-autoheight-webview": "^1.6.5", "react-native-big-calendar": "^4.15.0", @@ -18764,7 +18764,7 @@ }, "node_modules/react-native-artag-module": { "version": "0.1.2", - "resolved": "file:../06_Installables/react-native-artag-module-0.1.4.tgz", + "resolved": "file:../Installables/react-native-artag-module-0.1.4.tgz", "integrity": "sha512-PCLkgTS8MHITcG+UIdPhMnCfakVdj9esTlRiMcVSTVgLVv/Mqg0+ZGueXPZi5TUHZZum+zqe9Xsfy2D/UPADrg==", "license": "MIT", "peerDependencies": { diff --git a/package.json b/package.json index a448348..520ef94 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "react": "18.2.0", "react-native": "0.73.5", "react-native-app-intro-slider": "^4.0.4", - "react-native-artag-module": "file:../06_Installables/react-native-artag-module-0.1.4.tgz", + "react-native-artag-module": "file:../Installables/react-native-artag-module-0.1.4.tgz", "react-native-audio-recorder-player": "^3.6.11", "react-native-autoheight-webview": "^1.6.5", "react-native-big-calendar": "^4.15.0", diff --git a/src/api/license.api.tsx b/src/api/license.api.tsx index 8d9e4b5..05c32ac 100644 --- a/src/api/license.api.tsx +++ b/src/api/license.api.tsx @@ -30,7 +30,7 @@ export const getMenuList = async ({token, academic_year, app_type}: any) => { headers: { 'Content-Type': apiConfig.contentTypeJSON } } const url = `${Constants.easConfig.extra.LICENSE_BASE_URL + SCHOOL_LIST_API.GET_LICENSE_SCHOOLS}` - console.log(Constants.easConfig.extra) + return fetchAPI(url, requestOptions) } diff --git a/src/constants/Constants.tsx b/src/constants/Constants.tsx index f1214eb..b14c91b 100644 --- a/src/constants/Constants.tsx +++ b/src/constants/Constants.tsx @@ -59,7 +59,7 @@ export const getSchoolId = async () => { const userData = await AsyncStorage.getItem("schoolId") if(userData) { const userDetails: any = JSON.parse(userData) - // console.log(userDetails) + return userDetails } return null diff --git a/src/screens/SchoolCalendar/SchoolCalendar.tsx b/src/screens/SchoolCalendar/SchoolCalendar.tsx index 3fdab91..e9d31d6 100644 --- a/src/screens/SchoolCalendar/SchoolCalendar.tsx +++ b/src/screens/SchoolCalendar/SchoolCalendar.tsx @@ -22,7 +22,7 @@ class SchoolCalendar extends Component { super(props); this.state = { academicYear: '', - currentDate: new Date(2024, 9, 1), + currentDate: new Date(), eventsData: [], tooltipVisible: false, hoveredEvent: null, @@ -131,7 +131,7 @@ class SchoolCalendar extends Component { render() { const { currentDate, eventsData, modalVisible, selectedEvent } = this.state; - + return ( {eventsData && ( @@ -148,7 +148,7 @@ class SchoolCalendar extends Component { eventCellStyle={(event: MyEvent) => ({ backgroundColor: event.color || 'blue', borderRadius: 5, - zIndex:1000, + zIndex:10, borderWidth: 0, alignItems: 'center' })} diff --git a/src/screens/Student/StudentView.tsx b/src/screens/Student/StudentView.tsx index 5f695e0..84917f8 100644 --- a/src/screens/Student/StudentView.tsx +++ b/src/screens/Student/StudentView.tsx @@ -183,7 +183,7 @@ class StudentView extends React.Component{ { - item?.studentclass_details?.profile_picture ? + (this.imageBaseUrl && item?.studentclass_details?.profile_picture) ? diff --git a/yarn.lock b/yarn.lock index eeb0b5d..6411314 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6041,11 +6041,6 @@ fs.realpath@^1.0.0: resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== -fsevents@^2.3.2: - version "2.3.3" - resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz" - integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== - function-bind@^1.1.2: version "1.1.2" resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz" @@ -7508,10 +7503,10 @@ lighthouse-logger@^1.0.0: debug "^2.6.9" marky "^1.2.2" -lightningcss-darwin-x64@1.19.0: +lightningcss-win32-x64-msvc@1.19.0: version "1.19.0" - resolved "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.19.0.tgz" - integrity sha512-Lif1wD6P4poaw9c/4Uh2z+gmrWhw/HtXFoeZ3bEsv6Ia4tt8rOJBdkfVaUJ6VXmpKHALve+iTyP2+50xY1wKPw== + resolved "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.19.0.tgz" + integrity sha512-C+VuUTeSUOAaBZZOPT7Etn/agx/MatzJzGRkeV+zEABmPuntv1zihncsi+AyGmjkkzq3wVedEy7h0/4S84mUtg== lightningcss@~1.19.0: version "1.19.0" @@ -9046,9 +9041,9 @@ react-native-app-intro-slider@^4.0.4: resolved "https://registry.npmjs.org/react-native-app-intro-slider/-/react-native-app-intro-slider-4.0.4.tgz" integrity sha512-Zkjaol6X3BbZkHUpVDj2LjdidpS6rCgKi0fx80xgGKa0pHxBRd4swWTv2bHnnvu5k1/HXwYk0mY2TbK+2jHl5w== -"react-native-artag-module@file:../06_Installables/react-native-artag-module-0.1.4.tgz": +"react-native-artag-module@file:../Installables/react-native-artag-module-0.1.4.tgz": version "0.1.2" - resolved "file:../06_Installables/react-native-artag-module-0.1.4.tgz" + resolved "file:../Installables/react-native-artag-module-0.1.4.tgz" integrity sha512-PCLkgTS8MHITcG+UIdPhMnCfakVdj9esTlRiMcVSTVgLVv/Mqg0+ZGueXPZi5TUHZZum+zqe9Xsfy2D/UPADrg== react-native-audio-recorder-player@^3.6.11: