@campxdev/shared 1.2.3 → 1.2.5

package/package.json

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

package/src/components/Layout/Header/AppsMenu.tsx

@@ -1,4 +1,5 @@
 import { Box, Menu, Typography } from '@mui/material'
+import Cookies from 'js-cookie'
 import { useState } from 'react'
 import { applications } from './applications'
 import { AppsIcon } from './icons'
@@ -10,6 +11,8 @@ import {
   StyledLink,
 } from './styles'
 
+export const campxTenantKey = Cookies.get('campx_tenant')
+
 const AppsMenu = () => {
   const [anchorEl, setAnchorEl] = useState<any>(null)
   const open = Boolean(anchorEl)
@@ -55,7 +58,10 @@ const AppsMenu = () => {
         </Box>
         <Box>
           {applications.map((item, index) => (
-            <StyledLink href={item.path} key={index}>
+            <StyledLink
+              href={item.path + `/${campxTenantKey ?? ''}`}
+              key={index}
+            >
               <StyledMenuItemContainer
                 key={index}
                 onClick={() => {

package/src/components/LoginForm.tsx

@@ -40,7 +40,7 @@ export function LoginForm({ loginUrl }: { loginUrl?: string }) {
         method: 'POST',
         url: loginUrl
           ? loginUrl
-          : 'https://api.campx.dev/auth-server/auth/login',
+          : `https://api.campx.dev/auth-server/auth/login`,
         data: values,
       })
       Cookies.set('campx_tenant', res?.data?.subDomain)

package/src/contexts/Providers.tsx

@@ -18,7 +18,7 @@ export default function Providers({ children }: { children: ReactNode }) {
   const [isInvalid, setIsInvalid] = useState(false)
 
   useEffect(() => {
-    if (campxTenantKey === 'campx_dev' && !urlTenantKey) {
+    if (campxTenantKey === 'campx_dev') {
       window.location.href = window.location.origin + '/campx_dev'
     }
 
@@ -36,7 +36,7 @@ export default function Providers({ children }: { children: ReactNode }) {
   }, [])
 
   return (
-    <BrowserRouter basename={isDevelopment ? 'campx_dev' : urlTenantKey}>
+    <BrowserRouter basename={urlTenantKey}>
       <QueryClientProvider>
         <MuiThemeProvider>
           <ConfirmContextProvider>