@campxdev/shared 1.10.92 → 1.10.94

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@campxdev/shared",
-  "version": "1.10.92",
+  "version": "1.10.94",
   "main": "./exports.ts",
   "scripts": {
     "start": "react-scripts start",

package/src/components/Institutions/InsititutionsDialog.tsx

@@ -1,11 +1,11 @@
 import { Box, TextField, Typography, styled } from '@mui/material'
 import { useState } from 'react'
-import { InsititutionsStore } from '../../shared-state/InstitutionsStore'
+import { InstitutionsStore } from '../../shared-state/InstitutionsStore'
 import Image from '../Image/Image'
 
-export default function InsititutionsDialog({ close }) {
+export default function InstitutionsDialog({ close }) {
   const [searchText, setSearchText] = useState('')
-  const { institutions } = InsititutionsStore.useState((s) => s)
+  const { institutions } = InstitutionsStore.useState((s) => s)
   const filteredInstitutions = institutions.filter((item) =>
     item.name.toLowerCase().includes(searchText.toLowerCase()),
   )

package/src/components/Institutions/InstitutionsDropdown.tsx

@@ -1,9 +1,9 @@
 import { urlTenantKey } from '../../contexts/Providers'
-import { InsititutionsStore } from '../../shared-state/InstitutionsStore'
+import { InstitutionsStore } from '../../shared-state/InstitutionsStore'
 import { SearchSingleSelect } from '../Input/SearchSingleSelect'
 
 export default function SchoolSwitch() {
-  const { current, institutions } = InsititutionsStore.useState((s) => s)
+  const { current, institutions } = InstitutionsStore.useState((s) => s)
 
   const handleChange = (value) => {
     if (value) {

package/src/components/MyProfile/MyProfile.tsx

@@ -1,7 +1,7 @@
 import { Box, Chip, Container, Typography } from '@mui/material'
 import { useQuery } from 'react-query'
 import axios from '../../config/axios'
-import { InsititutionsStore } from '../../shared-state/InstitutionsStore'
+import { InstitutionsStore } from '../../shared-state/InstitutionsStore'
 import PageHeader from '../PageHeader'
 import Spinner from '../Spinner'
 import Education from './Education/Education'
@@ -19,7 +19,7 @@ import {
 import Workshop from './Workshop/Workshop'
 
 const MyProfile = ({ close }) => {
-  const { institutions, current } = InsititutionsStore.useState((s) => s)
+  const { institutions, current } = InstitutionsStore.useState((s) => s)
 
   const { data, isLoading } = useQuery('dashboard', () =>
     axios.get('/square/users/dashboard').then((res) => res?.data),

package/src/components/ReportHeader.tsx

@@ -1,12 +1,24 @@
-import { Box, Typography } from '@mui/material'
+import { Box, SxProps, Typography } from '@mui/material'
+import { Variant } from '@mui/material/styles/createTypography'
 
+interface TypographyList {
+  text: string
+  sx?: SxProps
+  variant?: Variant
+}
 interface ReportHeaderProps {
+  typographyList?: TypographyList[]
   logo: any
-  address: string
-  title?: string
+  imageSize?: string
+  containerSx?: SxProps
 }
 
-export const ReportHeader = ({ logo, address, title }: ReportHeaderProps) => {
+export default function ReportHeader({
+  logo,
+  typographyList,
+  containerSx,
+  imageSize,
+}: ReportHeaderProps) {
   return (
     <Box
       sx={{
@@ -14,24 +26,23 @@ export const ReportHeader = ({ logo, address, title }: ReportHeaderProps) => {
         flexDirection: 'column',
         alignItems: 'center',
         gap: '5px',
+        ...containerSx,
       }}
     >
       <img
         style={{
-          height: '40px',
+          height: imageSize ? imageSize : '80px',
           objectFit: 'contain',
         }}
         src={logo}
       />
 
-      <Typography variant="h5" style={{ fontSize: '15px' }}>
-        {address}
-      </Typography>
-      {title && (
-        <Typography variant="h2" style={{ fontSize: '13px' }}>
-          {title}
-        </Typography>
-      )}
+      {typographyList &&
+        typographyList.map((s) => (
+          <Typography variant={s.variant} sx={{ ...s.sx }}>
+            {s.text}
+          </Typography>
+        ))}
     </Box>
   )
 }

package/src/components/index.ts

@@ -58,6 +58,7 @@ export { default as NoDataIllustration } from './NoDataIllustration'
 export { PageContent } from './PageContent'
 export { default as PageHeader } from './PageHeader'
 export { default as useConfirm } from './PopupConfirm/useConfirm'
+export { default as ReportHeader } from './ReportHeader'
 export { default as ReportPageHeader } from './ReportPageHeader'
 export { default as Spinner } from './Spinner'
 export { default as PaymentStepper } from './Stepper'

package/src/config/axios.ts

@@ -3,7 +3,7 @@ import Cookies from 'js-cookie'
 import { toast } from 'react-toastify'
 import { NetworkStore } from '../components/ErrorBoundary/GlobalNetworkLoadingIndicator'
 import { isDevelopment, isSetup } from '../constants'
-import { InsititutionsStore } from '../shared-state/InstitutionsStore'
+import { InstitutionsStore } from '../shared-state/InstitutionsStore'
 
 const sessionKey = Cookies.get('campx_session_key')
 const clientId = window.location.pathname.split('/')[1] ?? 'campx_dev'
@@ -31,7 +31,7 @@ let axios = Axios.create({
 
 axios.interceptors.request.use(
   function (config: AxiosRequestConfig) {
-    const { current } = InsititutionsStore.getRawState()
+    const { current } = InstitutionsStore.getRawState()
     if (current) {
       config.headers['x-institution-code'] = current.code
     } else {

package/src/config/axiosXTenant.ts

@@ -7,6 +7,7 @@ import { formatParams } from './axios'
 const sessionKey = Cookies.get('campx_session_key')
 const clientId = window.location.pathname.split('/')[1] ?? 'campx_dev'
 const evaluatorKey = Cookies.get('campx_evaluator_key')
+const openPaymentsKey = Cookies.get('campx_open_payments_key')
 
 const axiosTenant = Axios.create({
   baseURL: process.env.REACT_APP_API_HOST,
@@ -20,6 +21,9 @@ const axiosTenant = Axios.create({
     ...(evaluatorKey && {
       campx_evaluator_key: evaluatorKey,
     }),
+    ...(openPaymentsKey && {
+      campx_open_payments_key: openPaymentsKey,
+    }),
   },
 })
 

package/src/contexts/Providers.tsx

@@ -35,7 +35,7 @@ export default function Providers({ children }: { children: ReactNode }) {
   useEffect(() => {
     if (!urlTenantKey) {
       if (isDevelopment) {
-        window.location.replace(window.location.origin + `/campx_dev`)
+        window.location.replace(window.location.origin + `/aupulse`)
       }
       if (campxTenantKey)
         window.location.replace(window.location.origin + `/${campxTenantKey}`)

package/src/hooks/useAuth.ts

@@ -6,7 +6,7 @@ import { isDevelopment } from '../constants'
 import { urlTenantKey } from '../contexts/Providers'
 import { openRootModal } from '../contexts/RootModal'
 import { AssetsStore, PermissionsStore, UserStore } from '../shared-state'
-import { InsititutionsStore } from '../shared-state/InstitutionsStore'
+import { InstitutionsStore } from '../shared-state/InstitutionsStore'
 
 const url = window.location.origin
 
@@ -97,7 +97,7 @@ function handleInstitutions(institutions) {
         `${window.location.origin}/${urlTenantKey}/${institutions[0]?.code}`,
       )
     }
-    InsititutionsStore.update((s) => {
+    InstitutionsStore.update((s) => {
       s.current = institutions[0]
       s.institutions = institutions
     })
@@ -125,7 +125,7 @@ function handleInstitutions(institutions) {
         },
       })
     }
-    InsititutionsStore.update((s) => {
+    InstitutionsStore.update((s) => {
       s.institutions = institutions
       s.current = institutions.find((item) => item.code === insititutionKey)
     })
@@ -174,7 +174,7 @@ const loginErrorHandler = ({
 function useAuth({ permissionsEndpoint, loginUrl }: AuthParams): AuthResponse {
   const [loading, setLoading] = useState<boolean>(false)
   const [data, setData] = useState(null)
-  const { current } = InsititutionsStore.useState()
+  const { current } = InstitutionsStore.useState()
 
   const appInit = async () => {
     setLoading(true)

package/src/shared-state/InstitutionsStore.ts

@@ -1,6 +1,6 @@
 import { Store } from 'pullstate'
 
-export const InsititutionsStore = new Store({
+export const InstitutionsStore = new Store({
   institutions: [],
   loading: false,
   error: null,

package/src/utils/getUrlParams.ts

@@ -1,5 +1,8 @@
 export default function getUrlParams() {
   const urlSearchParams = new URLSearchParams(window.location.search)
   const params = Object.fromEntries(urlSearchParams.entries())
+  for (const i in params) {
+    params[i] = decodeURIComponent(params[i])
+  }
   return params
 }