admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- update handleBeta

Browse Source 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
This commit is contained in:
Dave Richer
2024-01-18 16:50:30 -05:00
parent 7da5d1a4fd
commit e255f0a664
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/App/App.jsx
View File

@@ -54,9 +54,7 @@ export function App({bodyshop, checkUserSession, currentUser, online, setOnline}
} }
checkUserSession(); checkUserSession();
}, [checkUserSession, setOnline]);
handleBeta();
}, [checkUserSession, setOnline]);
//const b = Grid.useBreakpoint(); //const b = Grid.useBreakpoint();
// console.log("Breakpoints:", b); // console.log("Breakpoints:", b);
@@ -102,6 +100,8 @@ export function App({bodyshop, checkUserSession, currentUser, online, setOnline}
return <LoadingSpinner message={t("general.labels.loggingin")}/>; return <LoadingSpinner message={t("general.labels.loggingin")}/>;
} }
handleBeta();
if (!online) if (!online)
return ( return (
<Result <Result

6
client/src/utils/betaHandler.js
View File

@@ -24,12 +24,14 @@ export const handleBeta = () => {
// Beta is enabled, but the current host name does start with beta. // Beta is enabled, but the current host name does start with beta.
if (isBeta && !currentHostName.startsWith('beta')) { if (isBeta && !currentHostName.startsWith('beta')) {
window.location.href = `${window.location.protocol}//beta.${currentHostName}${window.location.pathname}${window.location.search}${window.location.hash}`; const href = `${window.location.protocol}//beta.${currentHostName}${window.location.pathname}${window.location.search}${window.location.hash}`;
window.location.replace(href);
} }
// Beta is not enabled, but the current host name does start with beta. // Beta is not enabled, but the current host name does start with beta.
else if (!isBeta && currentHostName.startsWith('beta')) { else if (!isBeta && currentHostName.startsWith('beta')) {
window.location.href = `${window.location.protocol}//${currentHostName.replace('beta.', '')}${window.location.pathname}${window.location.search}${window.location.hash}`; const href = `${window.location.protocol}//${currentHostName.replace('beta.', '')}${window.location.pathname}${window.location.search}${window.location.hash}`;
window.location.replace(href);
} }
} }
export default handleBeta; export default handleBeta;