From e1050b26a2ffbe31ec74808afd65c331668c164b Mon Sep 17 00:00:00 2001
From: Kristen Cooke
Date: Fri, 22 May 2020 13:47:22 -0700
Subject: [PATCH] feat: Update additional date in reg/login prompt
---
app/components/RegistrationLoginButtons.tsx | 14 +++++++----
app/pages/index.tsx | 4 +++-
app/pages/login-redirect.tsx | 23 +++++++++++++++++--
.../pages/__snapshots__/index.test.tsx.snap | 4 +++-
4 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/app/components/RegistrationLoginButtons.tsx b/app/components/RegistrationLoginButtons.tsx
index d27f46eaf1..ee984854d9 100644
--- a/app/components/RegistrationLoginButtons.tsx
+++ b/app/components/RegistrationLoginButtons.tsx
@@ -2,7 +2,13 @@ import React from 'react';
import {Col, Card} from 'react-bootstrap';
import LoginButton from './LoginButton';
-const RegistrationLoginButtons = () => {
+interface Props {
+ applicationDeadline: string;
+}
+
+const RegistrationLoginButtons: React.FunctionComponent = ({
+ applicationDeadline
+}) => {
return (
@@ -11,9 +17,9 @@ const RegistrationLoginButtons = () => {
Apply for the CleanBC Industrial Incentive Program (CIIP)
- Operators must submit a CIIP application form by June 30, 2019. As
- part of the application, information about the operation’s energy
- use, emissions, and production is required.
+ Operators must submit a CIIP application form by{' '}
+ {applicationDeadline}. As part of the application, information about
+ the operation’s energy use, emissions, and production is required.
{
emissions benchmarks.
-
+
diff --git a/app/pages/login-redirect.tsx b/app/pages/login-redirect.tsx
index 4c8412f5b7..2951d1e3bb 100644
--- a/app/pages/login-redirect.tsx
+++ b/app/pages/login-redirect.tsx
@@ -5,6 +5,10 @@ import {loginRedirectQueryResponse} from 'loginRedirectQuery.graphql';
import {CiipPageComponentProps} from 'next-env';
import DefaultLayout from 'layouts/default-layout';
import RegistrationLoginButtons from 'components/RegistrationLoginButtons';
+import moment from 'moment-timezone';
+
+const TIME_ZONE = 'America/Vancouver';
+
interface Props extends CiipPageComponentProps {
query: loginRedirectQueryResponse['query'];
}
@@ -16,13 +20,28 @@ export default class LoginRedirect extends Component {
session {
...defaultLayout_session
}
+ openedReportingYear {
+ applicationCloseTime
+ }
+ nextReportingYear {
+ applicationCloseTime
+ }
}
}
`;
render() {
const {query} = this.props;
- const {session} = query || {};
+ const {session, openedReportingYear, nextReportingYear} = query || {};
+
+ const deadline = moment
+ .tz(
+ openedReportingYear?.applicationCloseTime ??
+ nextReportingYear?.applicationCloseTime,
+ TIME_ZONE
+ )
+ .format('MMMM DD, YYYY');
+
return (
{
You will be redirected to the requested page after doing so.
-
+
);
diff --git a/app/tests/unit/pages/__snapshots__/index.test.tsx.snap b/app/tests/unit/pages/__snapshots__/index.test.tsx.snap
index 08b573f1e6..631f72de8e 100644
--- a/app/tests/unit/pages/__snapshots__/index.test.tsx.snap
+++ b/app/tests/unit/pages/__snapshots__/index.test.tsx.snap
@@ -44,7 +44,9 @@ exports[`landing It matches the last accepted Snapshot 1`] = `
The CIIP helps industrial operations across the province by reducing net carbon-tax costs for facilities near world-leading emissions benchmarks.
-
+
|