Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions app/src/index.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,32 @@
import React from 'react';
import ReactDOM from 'react-dom';
import { isSafari } from 'react-device-detect'

import './css/main.scss';
import './public/favicon.svg';

import App from '../src/js/App';
import UnsupportedBrowser from './js/components/unsupportedBrowser';

const isSafari = () => {
if (typeof navigator === 'undefined') return false;

const ua = navigator.userAgent;

// Check for Safari-specific identifiers in the user agent
const hasSafariString = /Safari/i.test(ua) && /AppleWebKit/i.test(ua);

// Exclude non-Safari browsers that may also include "Safari" in the UA
const isOtherBrowser = /Chrome|CriOS|Edg|OPR|FxiOS|Android/i.test(ua);

// Supplemental feature check: Safari exposes a unique global `window.safari` object
const isSafariObject = typeof window !== 'undefined' && !!window.safari;

return (hasSafariString && !isOtherBrowser) || isSafariObject;
};


// Add a const here to check for whether the user is using a valid browser
// This is a variable because it will allow for additonal browser checks in the future if necessary
const validBrowser = !isSafari
const validBrowser = !isSafari();

ReactDOM.render( validBrowser ? <App />: <UnsupportedBrowser />, document.getElementById('site-canvas'));
38 changes: 0 additions & 38 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,6 @@
"react-collapsible": "^2.8.1",
"react-datepicker": "^7.3.0",
"react-datetime-picker": "^3.4.3",
"react-device-detect": "^2.2.3",
"react-dom": "^17.0.2",
"react-flow-builder": "^2.8.0",
"react-qr-code": "^2.0.12",
Expand Down