Merge pull request #50 from vaivk369/oblf

Issue #000 fix: ui issues
tekdi · Feb 22, 2024 · 5d434a8 · 5d434a8
2 parents c065eea + 1db4bc5
commit 5d434a8
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/packages/cohort/src/pages/CohortList.js b/packages/cohort/src/pages/CohortList.js
@@ -121,7 +121,7 @@ export default function CohortList() {
           data={classes.map((item, index) => {
             return {
               title:
-                (item?.parentName ? item?.parentName + ", " : "") +
+                (item?.parentName ? item?.parentName + ", " : "") + " Level " +
                 (item?.name ? item?.name : "") +
                 (item?.section ? " • Sec " + item?.section : ""),
               subTitle: t("CLASS_TEACHER"),

diff --git a/packages/common-lib/src/config/footerLinks.js b/packages/common-lib/src/config/footerLinks.js
@@ -13,13 +13,13 @@ export default [
     route: '/cohorts',
     routeparameters: {}
   },
-  {
-    title: 'ADMIN',
-    icon: 'GovernmentLineIcon',
-    moduleName: 'admin',
-    route: '/admin',
-    routeparameters: {}
-  },
+  // {
+  //   title: 'ADMIN',
+  //   icon: 'GovernmentLineIcon',
+  //   moduleName: 'admin',
+  //   route: '/admin',
+  //   routeparameters: {}
+  // },
   // {
   //   title: 'TEACHING',
   //   icon: 'BookOpenLineIcon',

diff --git a/packages/profile/src/components/SelfAttendanceSheet.js b/packages/profile/src/components/SelfAttendanceSheet.js
@@ -448,7 +448,7 @@ export default function SelfAttendanceSheet({
                   >
                     {t("CLOSE")}
                   </Button>
-                  <Button
+                  {/* <Button
                     flex="1"
                     mr="5px"
                     colorScheme="button"
@@ -459,7 +459,7 @@ export default function SelfAttendanceSheet({
                     }}
                   >
                     {t("GO_TO_PROFILE")}
-                  </Button>
+                  </Button> */}
                 </Button.Group>
               )}
             </VStack>
@@ -704,7 +704,7 @@ export default function SelfAttendanceSheet({
             </Button>
           ) : (
             <Button.Group m="5">
-              <Button
+              {/* <Button
                 flex="1"
                 mr="5px"
                 colorScheme="button"
@@ -713,7 +713,7 @@ export default function SelfAttendanceSheet({
                 _text={{ textTransform: "uppercase" }}
               >
                 {t("GO_TO_PROFILE")}
-              </Button>
+              </Button> */}
               <Button
                 flex="1"
                 ml="5px"
@@ -831,15 +831,15 @@ export default function SelfAttendanceSheet({
             </Button>
           ) : (
             <Button.Group m="5">
-              <Button
+              {/* <Button
                 flex="1"
                 mr="5px"
                 colorScheme="button"
                 variant={"outline"}
                 onPress={(e) => navigate("/profile")}
               >
                 {t("GO_TO_PROFILE")}
-              </Button>
+              </Button> */}
               <Button
                 flex="1"
                 ml="5px"

diff --git a/packages/teacher-app/src/pages/Generic.js b/packages/teacher-app/src/pages/Generic.js
@@ -245,7 +245,7 @@ function Generic({ footerLinks, appName, setAlert }) {
             size="lg"
             style={{ borderRadius: "50%" }}
             source={{
-              uri: "https://images.unsplash.com/photo-1614289371518-722f2615943d?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=687&q=80",
+              uri: "https://png.pngtree.com/png-clipart/20210915/ourlarge/pngtree-user-avatar-placeholder-png-image_3918418.jpg",
             }}
           >
             {fullName?.toUpperCase().substr(0, 2)}