Merge branch 'staging' into main

src/components/Event/EventSignups.tsx

@@ -61,6 +61,12 @@ function EventSignup({ signup }: { signup: IEventSignup }) {
 				<b>{user.name}</b>
 				{extraDistance && ` +${extraDistance.toFixed(1)} miles`}{' '}
 				{signup.canDrive && ' (can drive)'}
+				{signup.note && (
+					<>
+						<br />
+						<span style={{ fontStyle: 'italic' }}>{signup.note}</span>
+					</>
+				)}
 			</span>
 
 			{!hasCarpool &&

src/components/WheelShareLoggedOut.tsx

@@ -1,4 +1,8 @@
-import { ionAuthorizationEndpoint } from './Authentication/authorizationEndpoint';
+import {
+	googleAuthorizationEndpoint,
+	ionAuthorizationEndpoint,
+} from './Authentication/authorizationEndpoint';
+import { showGoogleLogin } from './gatekeeper';
 import UILink from './UI/UILink';
 import UIPrimaryTitle from './UI/UIPrimaryTitle';
 
@@ -8,8 +12,24 @@ export default function WheelShareLoggedOut() {
 			<UIPrimaryTitle>WheelShare</UIPrimaryTitle>
 			<p>To get started, log in with your Ion account.</p>
 			<UILink href={ionAuthorizationEndpoint}>Log in with Ion</UILink>
-			{/* <br />
+			{showGoogleLogin() && (
-			<UILink href={googleAuthorizationEndpoint}>Log in with Google</UILink> */}
+				<>
+					<br />
+					<UILink href={googleAuthorizationEndpoint}>Log in with Google</UILink>
+				</>
+			)}
+			<br />
+			<p>
+				If you're new to Ion, follow{' '}
+				<a
+					href="https://guides.tjhsst.edu/ion/resetting-your-ion-password"
+					target="_blank"
+					rel="noopener noreferrer"
+				>
+					this guide
+				</a>{' '}
+				to create an account and reset your password
+			</p>
 		</>
 	);
 }

src/components/gatekeeper.ts

@@ -0,0 +1,3 @@
+export function showGoogleLogin() {
+	return process.env.NODE_ENV === 'development';
+}