@campxdev/shared 3.1.3-alpha1 → 3.1.3-alpha3

package/package.json

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

package/src/components/ReactJoyRide.tsx

@@ -1,11 +1,7 @@
-import TourIcon from '@mui/icons-material/Tour'
 import { Box, Button, Typography } from '@mui/material'
-import { ReactNode, useEffect, useState } from 'react'
-import ReactJoyride, { Step, CallBackProps } from 'react-joyride'
-import { useQuery } from 'react-query'
-import axios from '../config/axios'
+import { ReactNode, useState } from 'react'
+import ReactJoyride, { Step } from 'react-joyride'
 import './CustomJoyRideStyles.css'
-import Spinner from './Spinner'
 
 function ReactJoyRide({
   steps,
@@ -17,95 +13,65 @@ function ReactJoyRide({
   tourName: string
 }) {
   const [run, setRun] = useState(false)
-  const [stepIndex, setStepIndex] = useState(0)
-
-  const fetchTours = (params) => {
-    return axios.get(`/square/tours`).then((res) => res.data)
-  }
-
-  const { data: toursData, isLoading: toursLoading } = useQuery(
-    'tours',
-    fetchTours,
-  )
-
-  useEffect(() => {}, [run])
-
-  const completeTour = async () => {
-    try {
-      await axios.post(`/square/tours/complete`, { tourName })
-    } catch (error) {
-      // console.error('Error in Completing Tour:', error)
-    }
-  }
-
-  const handleJoyRideCallback = (data: CallBackProps) => {
-    const { action, status, index } = data
-
-    if (action === 'next' || action === 'prev') {
-      setStepIndex(index + (action === 'next' ? 1 : 0))
-    }
-
-    if (action === 'reset') {
-      setRun(false)
-      setStepIndex(0)
-      completeTour()
-    }
-  }
 
   const customSteps = steps.map((step, index) => ({
-      ...step,
-      title: '', // Remove the automatic title
-      content: (
-        <Box sx={{ fontFamily: 'Roboto, sans-serif',display: 'flex', flexDirection: 'column', }}>
-  
-          <Typography 
-            variant="caption" 
-            sx={{ 
-              color: '#6b7280', 
-              fontWeight: 500,
-              textTransform: 'uppercase',
-              letterSpacing: '0.5px',
-              fontSize: '11px',
+    ...step,
+    title: '', // Remove the automatic title
+    content: (
+      <Box
+        sx={{
+          fontFamily: 'Roboto, sans-serif',
+          display: 'flex',
+          flexDirection: 'column',
+        }}
+      >
+        <Typography
+          variant="caption"
+          sx={{
+            color: '#6b7280',
+            fontWeight: 500,
+            textTransform: 'uppercase',
+            letterSpacing: '0.5px',
+            fontSize: '11px',
+          }}
+        >
+          Step {index + 1}
+        </Typography>
+        <Box sx={{ padding: '4px 0' }}>
+          <Typography
+            sx={{
+              lineHeight: 1.5,
+              color: '#4b5563',
+              fontFamily: 'Poppins, sans-serif',
+              fontSize: '16px',
+              fontWeight: '600',
+              marginTop: '12px',
             }}
           >
-            Step {index + 1}
+            {step.title}
           </Typography>
-          <Box sx={{ padding: '4px 0' }}>
-            <Typography 
-              sx={{ 
-                lineHeight: 1.5,
-                color: '#4b5563',
-                fontFamily: 'Poppins, sans-serif',
-                fontSize: '16px',
-                fontWeight: '600',
-                marginTop: '12px',
-              }}
-            >
-              {step.title}
-            </Typography>
-          </Box>
-          <Box sx={{ padding: '4px 0' }}>
-            <Typography 
-              sx={{ 
-                fontSize: '14px',
-                lineHeight: 1.5,
-                color: '#4b5563',
-                fontFamily: 'Heebo, sans-serif',
-                fontWeight: '500',
-              }}
-            >
-              {step.content}
-            </Typography>
-          </Box>
         </Box>
-      ),
-    }))
+        <Box sx={{ padding: '4px 0' }}>
+          <Typography
+            sx={{
+              fontSize: '14px',
+              lineHeight: 1.5,
+              color: '#4b5563',
+              fontFamily: 'Heebo, sans-serif',
+              fontWeight: '500',
+            }}
+          >
+            {step.content}
+          </Typography>
+        </Box>
+      </Box>
+    ),
+  }))
 
   return (
     <>
       <Box>
         <ReactJoyride
-          callback={handleJoyRideCallback}
           run={run}
           steps={customSteps}
           styles={{
@@ -119,7 +85,8 @@ function ReactJoyRide({
             },
             tooltip: {
               borderRadius: '12px',
-              boxShadow: '0 20px 25px -5px rgba(0, 0, 0, 0.1), 0 10px 10px -5px rgba(0, 0, 0, 0.04)',
+              boxShadow:
+                '0 20px 25px -5px rgba(0, 0, 0, 0.1), 0 10px 10px -5px rgba(0, 0, 0, 0.04)',
               fontSize: '14px',
               padding: '20px',
               minWidth: '320px',
@@ -132,7 +99,7 @@ function ReactJoyRide({
               fontSize: '16px',
               fontWeight: '600',
               color: '#1f2937',
-     fontFamily: 'Poppins, sans-serif',
+              fontFamily: 'Poppins, sans-serif',
             },
             tooltipContent: {
               fontSize: '14px',
@@ -140,7 +107,7 @@ function ReactJoyRide({
               color: '#4b5563',
               padding: '0',
               fontFamily: 'Heebo, sans-serif !important',
-              fontWeight: '400'
+              fontWeight: '400',
             },
             buttonNext: {
               backgroundColor: '#121212',
@@ -246,7 +213,8 @@ function ReactJoyRide({
             '&:hover': {
               backgroundColor: '#1E027F',
               color: 'white',
-              boxShadow: '0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05)',
+              boxShadow:
+                '0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05)',
               transform: 'translateY(-50%) translateX(-4px)',
             },
             '&:active': {

package/src/config/axios.ts

@@ -59,7 +59,9 @@ axios.interceptors.request.use(
       workspaceApiMapping[window.location.pathname.split('/')[2]]
     ) {
       const workspacePrefix = workspaceApiMapping[window.location.pathname.split('/')[2]]
-      config.url = `${workspacePrefix}${config.url}`
+      if (workspacePrefix && typeof workspacePrefix === 'string' && workspacePrefix.trim()) {
+        config.url = `${workspacePrefix}${config.url}`
+      }
     }
 
     // Add session keys from cookies if available

package/src/hooks/useAuth.ts

@@ -104,7 +104,7 @@ const useAuth = ({
 
   const appInit = async () => {
     try {
-      const res = await axios.get(permissionsEndpoint)
+      const res = await axios.get(permissionsEndpoint, { workspace: false })
       const isAdmin = checkIsAdmin(res.data.user)
       setLoading(false)
       setData(res.data)