Skip to content
This repository was archived by the owner on Oct 2, 2025. It is now read-only.
Open
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
1 change: 1 addition & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"react/require-default-props": "off",
"linebreak-style": "off",
"no-param-reassign": "off",
"react/prop-types": "off",
"max-len": "off"
}
}
10 changes: 9 additions & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
import React from 'react';
import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';

// import ReactGa from 'react-ga';
import Home from 'pages/Home';
import Auth from 'pages/Auth';
import StaticFileRedirect from 'components/StaticFileRedirect';

function App(): JSX.Element {
// const notifyGA = (path: string) => {
// switch (path) {
// case "/":
// ReactGa.pageview()
// break;
// };
// };

return (
<Router>
<Switch>
Expand Down
8 changes: 8 additions & 0 deletions src/GARouteUpdater.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import React from 'react';

const GARouteUpdater: React.FC = () => (
<>
</>
);

export default GARouteUpdater;
2 changes: 1 addition & 1 deletion src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import App from './App';
import reportWebVitals from './reportWebVitals';

ReactGA.initialize('G-2D2S4GLZPR', {
testMode: process.env.NODE_ENV !== 'production',
// testMode: process.env.NODE_ENV !== 'production',
});

ReactDOM.render(
Expand Down
49 changes: 28 additions & 21 deletions src/pages/Auth/index.tsx
Original file line number Diff line number Diff line change
@@ -1,40 +1,47 @@
import React from 'react';
import React, { useEffect } from 'react';
import queryString from 'query-string';
import { useLocation } from 'react-router-dom';

import ReactGa from 'react-ga';
import { getToken } from 'util/api';
// import Loading from 'components/Loading';

function mobileRedirect(os: 'android' | 'ios', code: string) {
ReactGa.event({
category: 'mobile',
action: os,
});
const to = `hackillinois://org.hackillinois.${os}/auth?code=${code}`;
window.location.replace(to);
}

type QueryTypes = {
code?: string;
isAndroid?: string;
isiOS?: string;
to?: string;
};

const Auth: React.FC = () => {
const location = useLocation();

type QueryTypes = {
code?: string;
isAndroid?: string;
isiOS?: string;
to?: string;
};
const { code, isAndroid, isiOS, to }: QueryTypes = queryString.parse(location.search);
useEffect(() => {
ReactGa.pageview('/auth');
const { code, isAndroid, isiOS, to }: QueryTypes = queryString.parse(location.search);

if (code) {
if (isAndroid || isiOS) {
const os = isAndroid ? 'android' : 'ios';
mobileRedirect(os, code);
if (code) {
if (isAndroid || isiOS) {
const os = isAndroid ? 'android' : 'ios';
mobileRedirect(os, code);
} else {
getToken(code).then((token) => {
sessionStorage.setItem('token', token);
window.location.replace(to as string);
});
}
} else {
getToken(code).then((token) => {
sessionStorage.setItem('token', token);
window.location.replace(to as string);
});
window.location.replace('/');
}
} else {
window.location.replace('/');
}

}, []);
return <div>Loading...</div>; // <Loading />;
};

Expand Down
24 changes: 16 additions & 8 deletions src/pages/Home/index.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
import React from 'react';

import React, { useEffect } from 'react';
import ReactGa from 'react-ga';
import Hero from './Hero';
// import EventInfo from './EventInfo';

const Home: React.FC = () => (
<>
<Hero />
{/* <EventInfo /> */}
</>
);
const Home: React.FC = () => {
useEffect(() => {
ReactGa.pageview('/');
}, []);

return (
<>
<Hero />
{
/* <EventInfo /> */
}
</>
);
};

export default Home;