diff --git a/apiserver/apiserver/api/views.py b/apiserver/apiserver/api/views.py index 0023c8f..d583b95 100644 --- a/apiserver/apiserver/api/views.py +++ b/apiserver/apiserver/api/views.py @@ -502,6 +502,8 @@ class StatsViewSet(viewsets.ViewSet, List): if not user.is_authenticated or not user.member.vetted_date: stats.pop('alarm', None) + stats['at_protospace'] = utils.is_request_from_protospace(request) + return Response(stats) @action(detail=False, methods=['post']) diff --git a/webclient/src/Home.js b/webclient/src/Home.js index 75df819..ba3d921 100644 --- a/webclient/src/Home.js +++ b/webclient/src/Home.js @@ -166,6 +166,8 @@ export function Home(props) { const alarmStat = () => stats && stats.alarm && moment().unix() - stats.alarm['time'] < 300 ? stats.alarm['data'] < 270 ? 'Armed' : 'Disarmed' : 'Unknown'; + const show_signup = stats?.at_protospace || bypass_code; + return ( @@ -197,7 +199,7 @@ export function Home(props) { } - + } diff --git a/webclient/src/LoginSignup.js b/webclient/src/LoginSignup.js index ec8634d..7950bff 100644 --- a/webclient/src/LoginSignup.js +++ b/webclient/src/LoginSignup.js @@ -112,74 +112,92 @@ export function SignupForm(props) {
Sign Up to Spaceport
- - - - + {props.show_signup ? + <> + + + + - - + + - - - - + + + + - - + + - - Sign Up - + + Sign Up + + + : + <> + + Please Visit Protospace +

You'll need to sign a waiver and fill out member forms.

+
+

+ Our address:
+ 1530 27th Avenue NE
+ Bay 108
+ Calgary, Alberta, Canada +

+

Google Maps Link

+ + } ); };