From 1698d513be1f6688bef892974897724bbb471e8e Mon Sep 17 00:00:00 2001 From: Michael Fatemi Date: Tue, 17 Aug 2021 20:41:29 -0400 Subject: [PATCH 1/4] add ion guide link --- src/components/WheelShareLoggedOut.tsx | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/components/WheelShareLoggedOut.tsx b/src/components/WheelShareLoggedOut.tsx index ea93866..d62246d 100644 --- a/src/components/WheelShareLoggedOut.tsx +++ b/src/components/WheelShareLoggedOut.tsx @@ -13,6 +13,14 @@ export default function WheelShareLoggedOut() { Log in with Ion
Log in with Google +
+

+ If you're new to Ion, follow{' '} + + this guide + {' '} + to create an account and reset your password +

); } From 420c4ff9cc236ffafde9c817bc51ab7cd421b39a Mon Sep 17 00:00:00 2001 From: Michael Fatemi Date: Tue, 17 Aug 2021 20:50:03 -0400 Subject: [PATCH 2/4] make ion guide open in new tab --- src/components/WheelShareLoggedOut.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/WheelShareLoggedOut.tsx b/src/components/WheelShareLoggedOut.tsx index d62246d..0453947 100644 --- a/src/components/WheelShareLoggedOut.tsx +++ b/src/components/WheelShareLoggedOut.tsx @@ -16,7 +16,11 @@ export default function WheelShareLoggedOut() {

If you're new to Ion, follow{' '} - + this guide {' '} to create an account and reset your password From ed0bcc87395550af90bef0699135d37f31fa6e1e Mon Sep 17 00:00:00 2001 From: Michael Fatemi Date: Tue, 17 Aug 2021 22:09:34 -0400 Subject: [PATCH 3/4] show signup note in event signup list --- src/components/Event/EventSignups.tsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/components/Event/EventSignups.tsx b/src/components/Event/EventSignups.tsx index ee25d9e..9725cac 100644 --- a/src/components/Event/EventSignups.tsx +++ b/src/components/Event/EventSignups.tsx @@ -61,6 +61,12 @@ function EventSignup({ signup }: { signup: IEventSignup }) { {user.name} {extraDistance && ` +${extraDistance.toFixed(1)} miles`}{' '} {signup.canDrive && ' (can drive)'} + {signup.note && ( + <> +
+ {signup.note} + + )} {!hasCarpool && From e2eaaa0fbb909153bec52bca0134d71d739289b4 Mon Sep 17 00:00:00 2001 From: Michael Fatemi Date: Tue, 17 Aug 2021 22:12:22 -0400 Subject: [PATCH 4/4] add gatekeeper --- src/components/WheelShareLoggedOut.tsx | 9 +++++++-- src/components/gatekeeper.ts | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 src/components/gatekeeper.ts diff --git a/src/components/WheelShareLoggedOut.tsx b/src/components/WheelShareLoggedOut.tsx index 0453947..eb4c172 100644 --- a/src/components/WheelShareLoggedOut.tsx +++ b/src/components/WheelShareLoggedOut.tsx @@ -2,6 +2,7 @@ import { googleAuthorizationEndpoint, ionAuthorizationEndpoint, } from './Authentication/authorizationEndpoint'; +import { showGoogleLogin } from './gatekeeper'; import UILink from './UI/UILink'; import UIPrimaryTitle from './UI/UIPrimaryTitle'; @@ -11,8 +12,12 @@ export default function WheelShareLoggedOut() { WheelShare

To get started, log in with your Ion account.

Log in with Ion -
- Log in with Google + {showGoogleLogin() && ( + <> +
+ Log in with Google + + )}

If you're new to Ion, follow{' '} diff --git a/src/components/gatekeeper.ts b/src/components/gatekeeper.ts new file mode 100644 index 0000000..2f97d70 --- /dev/null +++ b/src/components/gatekeeper.ts @@ -0,0 +1,3 @@ +export function showGoogleLogin() { + return process.env.NODE_ENV === 'development'; +}