@campxdev/shared 1.11.31 → 1.11.32-alpha.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@campxdev/shared",
-  "version": "1.11.31",
+  "version": "1.11.32-alpha.10",
   "main": "./exports.ts",
   "scripts": {
     "start": "react-scripts start",

package/src/components/Institutions/InsititutionsDialog.tsx

@@ -32,12 +32,9 @@ export default function InstitutionsDialog({ close }) {
 }
 
 const InstitutionCard = ({ institution }) => {
-  const urlTenantKey = window.location.pathname.split('/')[1]
   const handleClick = () => {
     localStorage.setItem('institution_key', institution?.code)
-    window.location.replace(
-      `${window.location.origin}/${urlTenantKey}/${institution?.code}`,
-    )
+    window.location.replace(`${window.location.origin}/${institution?.code}`)
   }
 
   return (

package/src/components/Institutions/InstitutionsDropdown.tsx

@@ -1,4 +1,3 @@
-import { urlTenantKey } from '../../contexts/Providers'
 import { InstitutionsStore } from '../../shared-state/InstitutionsStore'
 import { SearchSingleSelect } from '../Input/SearchSingleSelect'
 
@@ -8,9 +7,7 @@ export default function SchoolSwitch() {
   const handleChange = (value) => {
     if (value) {
       localStorage.setItem('institution_key', value?.value)
-      window.location.replace(
-        `${window.location.origin}/${urlTenantKey}/${value?.value}`,
-      )
+      window.location.replace(`${window.location.origin}/${value?.value}`)
     }
   }
   const options =

package/src/components/Layout/LayoutWrapper.tsx

@@ -2,6 +2,7 @@ import {
   StyledLeftNavContainer,
   StyledMainContentContainer,
 } from '../../layouts/Components/styles'
+import { PermissionsStore } from '../../shared-state'
 import ErrorBoundary from '../ErrorBoundary'
 import SideNav from './SideNav'
 interface Props {
@@ -15,12 +16,29 @@ export default function LayoutWrapper({
   menu,
   sideMenuHeader,
 }: Props) {
+  const permissions = PermissionsStore.useState()
+
   return (
     <ErrorBoundary>
-      <StyledLeftNavContainer>
-        <SideNav menuItems={menu as any[]} header={sideMenuHeader} />
-      </StyledLeftNavContainer>
-      <StyledMainContentContainer>
+      {!permissions.isHomePageEnabled && (
+        <StyledLeftNavContainer>
+          <SideNav menuItems={menu as any[]} header={sideMenuHeader} />
+        </StyledLeftNavContainer>
+      )}
+      <StyledMainContentContainer
+        style={{
+          width: permissions.isHomePageEnabled
+            ? 'inherit'
+            : 'calc(100% - 220px)',
+          position: permissions.isHomePageEnabled ? 'unset' : 'fixed',
+          marginTop: permissions.isHomePageEnabled ? '10px' : '0px',
+          borderRadius: permissions.isHomePageEnabled ? '10px' : '0px',
+          border: permissions.isHomePageEnabled ? '1px solid #1212' : 'none',
+          height: permissions.isHomePageEnabled
+            ? 'calc(100vh - 74px)'
+            : 'calc(100vh - 64px)',
+        }}
+      >
         <ErrorBoundary>{children}</ErrorBoundary>
       </StyledMainContentContainer>
     </ErrorBoundary>

package/src/components/LoginForm.tsx

@@ -63,7 +63,7 @@ export function LoginForm({
       })
       Cookies.set('campx_tenant', res?.data?.subDomain)
       Cookies.set('campx_session_key', res.data?.token)
-      window.location.href = window.location.origin + `/${res?.data?.subDomain}`
+      window.location.href = window.location.origin
     } catch (err) {
       // eslint-disable-next-line no-console
       console.log(err)

package/src/components/Selectors/ExamGroupSelector.tsx

@@ -26,13 +26,13 @@ const ExamGroupSelector = (props: ExamGroupSelectorProps) => {
   const [prevExamType, setPrevExamType] = useState(null)
   const [prevCourseId, setPrevCourseId] = useState(null)
   let api =
-    filters.examType !== 'internal'
+    filters?.examType !== 'internal'
       ? '/exams/exams/exam-groups'
       : '/exams/internal-exams'
   const handleOpen = () => {
     if (filters) {
       if (
-        (filters.examType && filters.examType !== prevExamType) ||
+        (filters?.examType && filters?.examType !== prevExamType) ||
         (filters?.courseId && filters?.courseId !== prevCourseId)
       ) {
         setOptions([])
@@ -46,12 +46,12 @@ const ExamGroupSelector = (props: ExamGroupSelectorProps) => {
           })
           .then((response) => {
             setOptions(
-              filters.examType !== 'internal'
+              filters?.examType !== 'internal'
                 ? response.data?.examGroups
                 : response.data?.exams,
             )
-            setPrevExamType(filters.examType)
-            setPrevCourseId(filters.courseId)
+            setPrevExamType(filters?.examType)
+            setPrevCourseId(filters?.courseId)
           })
           .catch((error) => {
             console.error('Error fetching data from the API:', error)
@@ -59,9 +59,18 @@ const ExamGroupSelector = (props: ExamGroupSelectorProps) => {
       }
     } else if (options.length === 0) {
       axios
-        .get(api)
+        .get(api, {
+          params: {
+            isArchived: 'false',
+            isExamPublished: 'true',
+          },
+        })
         .then((response) => {
-          setOptions(response.data)
+          setOptions(
+            filters?.examType !== 'internal'
+              ? response.data?.examGroups
+              : response.data?.exams,
+          )
         })
         .catch((error) => {
           console.error('Error fetching data from the API:', error)
@@ -80,7 +89,7 @@ const ExamGroupSelector = (props: ExamGroupSelectorProps) => {
           ...(allowAll ? [{ value: 'all', label: 'All' }] : []),
           ...options.map((item) => ({
             label:
-              filters.examType != 'internal'
+              filters?.examType != 'internal'
                 ? item?.groupName
                 : item?.displayName,
             value: item?.id,

package/src/config/axios.ts

@@ -6,8 +6,8 @@ import { isDevelopment, isSetup } from '../constants'
 import { InstitutionsStore } from '../shared-state/InstitutionsStore'
 
 const sessionKey = Cookies.get('campx_session_key')
-const clientId = window.location.pathname.split('/')[1] ?? 'campx_dev'
-const institutionId = window.location.pathname.split('/')[2] ?? 'campx_dev'
+const clientId = window.location.hostname.split('.')[0] ?? 'campx_dev'
+const institutionId = window.location.pathname.split('/')[1] ?? 'campx_dev'
 const openPaymentsKey = Cookies.get('campx_open_payments_key')
 
 export const formatParams = (params) => {

package/src/contexts/Providers.tsx

@@ -9,14 +9,19 @@ import { ToastContainer } from '../components'
 import DialogProvider from '../components/DrawerWrapper/DrawerWrapper'
 import GlobalNetworkLoadingIndicator from '../components/ErrorBoundary/GlobalNetworkLoadingIndicator'
 import ErrorModalProvider from '../components/ErrorModalWrapper/ErrorModalWrapper'
-import { isDevelopment } from '../constants'
 import RootModal from './RootModal'
 
 export const campxTenantKey = Cookies.get('campx_tenant')
-export const urlTenantKey = window.location.pathname.split('/')[1]
-export const instituitionKey = window.location.pathname.split('/')[2]
+export const urlTenantKey = window.location.hostname.split('.')[0]
+export const instituitionKey = window.location.pathname.split('/')[1]
 
-export default function Providers({ children }: { children: ReactNode }) {
+export default function Providers({
+  children,
+  module,
+}: {
+  children: ReactNode
+  module?: string
+}) {
   const localInstituitionKey = localStorage.getItem('institution_key')
 
   const getInstituitionKey = () => {
@@ -33,29 +38,30 @@ export default function Providers({ children }: { children: ReactNode }) {
   }
 
   useEffect(() => {
-    if (!urlTenantKey) {
-      if (isDevelopment) {
-        window.location.replace(window.location.origin + `/aupulse`)
-      }
-      if (campxTenantKey)
-        window.location.replace(window.location.origin + `/${campxTenantKey}`)
-    } else {
-      if (!instituitionKey) {
-        if (localInstituitionKey) {
+    console.log(instituitionKey, localInstituitionKey)
+    if (!instituitionKey) {
+      if (localInstituitionKey) {
+        if (module) {
+          window.location.replace(
+            window.location.origin + `/${localInstituitionKey}/${module}`,
+          )
+        } else {
           window.location.replace(
-            window.location.origin + `/${urlTenantKey}/${localInstituitionKey}`,
+            window.location.origin + `/${localInstituitionKey}`,
           )
         }
       }
     }
   }, [])
 
-  const baseName = getInstituitionKey()
-    ? `${urlTenantKey}/${getInstituitionKey()}`
-    : urlTenantKey
+  const defaultBaseName = getInstituitionKey()
+    ? module
+      ? `${getInstituitionKey()}/${module}`
+      : `${getInstituitionKey()}`
+    : ''
 
   return (
-    <BrowserRouter basename={baseName}>
+    <BrowserRouter basename={defaultBaseName}>
       <QueryClientProvider>
         <MuiThemeProvider>
           <ConfirmContextProvider>

package/src/hooks/useAuth.ts

@@ -3,7 +3,6 @@ import { useEffect, useState } from 'react'
 import { toast } from 'react-toastify'
 import axios from '../config/axios'
 import { isDevelopment } from '../constants'
-import { urlTenantKey } from '../contexts/Providers'
 import { openRootModal } from '../contexts/RootModal'
 import { AssetsStore, PermissionsStore, UserStore } from '../shared-state'
 import { InstitutionsStore } from '../shared-state/InstitutionsStore'
@@ -26,6 +25,7 @@ type AuthResponse = {
       logo: string
       logo_square: string
     }
+    isHomePageEnabled?: boolean
   }
 }
 
@@ -63,7 +63,7 @@ const checkIsAdmin = (user) => {
   return isAdmin ? 1 : 0
 }
 const getInstitutionKey = () => {
-  const instituitionKey = window.location.pathname.split('/')[2]
+  const instituitionKey = window.location.pathname.split('/')[1]
   if (!instituitionKey) {
     const localInstituitionKey = localStorage.getItem('institution_key')
     if (localInstituitionKey) {
@@ -90,12 +90,12 @@ function handleInstitutions(institutions) {
   if (institutions?.length === 1) {
     if (!insititutionKey) {
       window.location.replace(
-        `${window.location.origin}/${urlTenantKey}/${institutions[0]?.code}`,
+        `${window.location.origin}/${institutions[0]?.code}`,
       )
     }
     if (insititutionKey !== institutions[0]?.code) {
       window.location.replace(
-        `${window.location.origin}/${urlTenantKey}/${institutions[0]?.code}`,
+        `${window.location.origin}/${institutions[0]?.code}`,
       )
     }
     InstitutionsStore.update((s) => {
@@ -235,6 +235,7 @@ function useAuth({ permissionsEndpoint, loginUrl }: AuthParams): AuthResponse {
           s.isMasterInstitutionUser = res.data?.institutions
             ?.map((institution) => institution?.id)
             ?.includes(res?.data?.masterInstitutionUniqueId)
+          s.isHomePageEnabled = res.data?.isHomePageEnabled
         })
         AssetsStore.update((s) => {
           s.logo = res.data?.assets.logo

package/src/layouts/Components/styles.tsx

@@ -1,5 +1,5 @@
-import styled from 'styled-components'
 import { styled as muiStyled } from '@mui/material'
+import styled from 'styled-components'
 
 export const headerHeight = '64px'
 export const sideNavWidth = '220px'
@@ -59,16 +59,29 @@ export const StyledMainContentContainer = muiStyled('main')(() => ({
   overflowY: 'auto',
 
   '&::-webkit-scrollbar': {
-    width: '0.6em',
-    height: '0.6em',
+    width: '0.4em',
+    height: '0.4em',
   },
 
   '&::-webkit-scrollbar-thumb': {
-    backgroundColor: 'rgba(0,0,0, 0.3)',
+    backgroundColor: 'rgba(0, 0, 0, 0.2)',
     borderRadius: '3px',
-
     '&:hover': {
       background: 'rgba(0,0,0, 0.4)',
     },
   },
+
+  // '&::-webkit-scrollbar': {
+  //   width: '0.6em',
+  //   height: '0.6em',
+  // },
+
+  // '&::-webkit-scrollbar-thumb': {
+  //   backgroundColor: 'rgba(0,0,0, 0.3)',
+  //   borderRadius: '3px',
+
+  //   '&:hover': {
+  //     background: 'rgba(0,0,0, 0.4)',
+  //   },
+  // },
 }))

package/src/shared-state/PermissionsStore.ts

@@ -2047,6 +2047,7 @@ interface IPermissionsStore {
   masterInstitutionId?: string
   isMasterInstitution: boolean
   isMasterInstitutionUser?: boolean
+  isHomePageEnabled?: boolean
 }
 
 export const PermissionsStore = new Store<IPermissionsStore>({
@@ -2057,4 +2058,5 @@ export const PermissionsStore = new Store<IPermissionsStore>({
   masterInstitutionId: null,
   isMasterInstitution: false,
   isMasterInstitutionUser: false,
+  isHomePageEnabled: false,
 })