fix: remove isRecording condition
This commit is contained in:
@@ -55,7 +55,7 @@ export const PageWrapper = () => {
|
|||||||
const sessionParam = urlParams.get('session');
|
const sessionParam = urlParams.get('session');
|
||||||
const storedSessionId = getTabState('recordingSessionId');
|
const storedSessionId = getTabState('recordingSessionId');
|
||||||
const storedRecordingUrl = getTabState('recordingUrl');
|
const storedRecordingUrl = getTabState('recordingUrl');
|
||||||
|
|
||||||
if (location.pathname === '/recording-setup' && sessionParam && sessionParam === storedSessionId) {
|
if (location.pathname === '/recording-setup' && sessionParam && sessionParam === storedSessionId) {
|
||||||
setBrowserId('new-recording');
|
setBrowserId('new-recording');
|
||||||
setRecordingName('');
|
setRecordingName('');
|
||||||
@@ -67,14 +67,14 @@ export const PageWrapper = () => {
|
|||||||
|
|
||||||
navigate('/recording');
|
navigate('/recording');
|
||||||
}
|
}
|
||||||
else if (location.pathname === '/recording' ||
|
else if (location.pathname === '/recording' ||
|
||||||
(getTabState('nextTabIsRecording') === 'true' && sessionParam === storedSessionId)) {
|
(getTabState('nextTabIsRecording') === 'true' && sessionParam === storedSessionId)) {
|
||||||
setIsRecordingMode(true);
|
setIsRecordingMode(true);
|
||||||
|
|
||||||
if (location.pathname !== '/recording') {
|
if (location.pathname !== '/recording') {
|
||||||
navigate('/recording');
|
navigate('/recording');
|
||||||
}
|
}
|
||||||
|
|
||||||
window.sessionStorage.removeItem('nextTabIsRecording');
|
window.sessionStorage.removeItem('nextTabIsRecording');
|
||||||
} else if (tabMode === 'main') {
|
} else if (tabMode === 'main') {
|
||||||
console.log('Tab is in main application mode');
|
console.log('Tab is in main application mode');
|
||||||
@@ -88,7 +88,7 @@ export const PageWrapper = () => {
|
|||||||
|
|
||||||
const isAuthPage = location.pathname === '/login' || location.pathname === '/register';
|
const isAuthPage = location.pathname === '/login' || location.pathname === '/register';
|
||||||
const isRecordingPage = location.pathname === '/recording';
|
const isRecordingPage = location.pathname === '/recording';
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<AuthProvider>
|
<AuthProvider>
|
||||||
@@ -96,18 +96,18 @@ export const PageWrapper = () => {
|
|||||||
<React.Fragment>
|
<React.Fragment>
|
||||||
{/* Show NavBar only for main app pages, not for recording pages */}
|
{/* Show NavBar only for main app pages, not for recording pages */}
|
||||||
{!isRecordingPage && (
|
{!isRecordingPage && (
|
||||||
<Box sx={{
|
<Box sx={{
|
||||||
position: 'sticky',
|
position: 'sticky',
|
||||||
top: 0,
|
top: 0,
|
||||||
zIndex: 1100,
|
zIndex: 1100,
|
||||||
backgroundColor: 'background.paper'
|
backgroundColor: 'background.paper'
|
||||||
}}>
|
}}>
|
||||||
<NavBar recordingName={recordingName} isRecording={false} />
|
<NavBar recordingName={recordingName} isRecording={false} />
|
||||||
</Box>
|
</Box>
|
||||||
)}
|
)}
|
||||||
<Box sx={{
|
<Box sx={{
|
||||||
display: isAuthPage || isRecordingPage ? 'block' : 'flex',
|
display: isAuthPage ? 'block' : 'flex',
|
||||||
minHeight: isAuthPage || isRecordingPage ? '100vh' : 'calc(100vh - 64px)'
|
minHeight: isAuthPage ? '100vh' : 'calc(100vh - 64px)'
|
||||||
}}>
|
}}>
|
||||||
<Routes>
|
<Routes>
|
||||||
<Route element={<UserRoute />}>
|
<Route element={<UserRoute />}>
|
||||||
|
|||||||
Reference in New Issue
Block a user