Skip to content

Commit 083cc8e

Browse files
committed
feat: intake 6 UI preparation
1 parent e752c96 commit 083cc8e

File tree

5 files changed

+49
-29
lines changed

5 files changed

+49
-29
lines changed

app/components/Dashboard/Row.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ const Row = ({ application, onWithdraw, onDelete, schema }) => {
6161
status === 'submitted' ||
6262
status === 'applicant_conditionally_approved';
6363
const isDraft = application.status === 'draft';
64-
const isEditable = formData.isEditable && status !== 'withdrawn';
64+
const isEditable = false && formData.isEditable && status !== 'withdrawn';
6565

6666
const getApplicationUrl = () => {
6767
if (isWithdrawn) {

app/components/Dashboard/Table.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import ArchiveModal from './ArchiveModal';
1010
import WithdrawModal from './WithdrawModal';
1111

1212
const StyledFontAwesome = styled(FontAwesomeIcon)`
13-
margin-left: 4px; ;
13+
margin-left: 4px;
1414
`;
1515

1616
const StyledTable = styled('table')`

app/components/Form/ApplicationForm.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -217,11 +217,12 @@ const ApplicationForm: React.FC<Props> = ({
217217
jsonData,
218218
rowId: formDataRowId,
219219
id: formDataId,
220-
isEditable,
220+
// isEditable,
221221
updatedAt,
222222
},
223223
status,
224224
} = application;
225+
const isEditable = false;
225226
const ccbcIntakeNumber =
226227
application.intakeByIntakeId?.ccbcIntakeNumber || null;
227228
const latestIntakeNumber =

app/pages/applicantportal/dashboard.tsx

+30-10
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ const Dashboard = ({
7878
const query = usePreloadedQuery(getDashboardQuery, preloadedQuery);
7979
const { allApplications, nextIntake, openIntake, session, openHiddenIntake } =
8080
query;
81+
const disableIntake = true;
8182

8283
const closeTimestamp = openIntake?.closeTimestamp;
8384
const isRollingIntake = openIntake?.rollingIntake ?? false;
@@ -154,11 +155,20 @@ const Dashboard = ({
154155
<h1>Dashboard</h1>
155156
{openIntake ? (
156157
<p>
157-
{isRollingIntake
158-
? `The review of applications will begin immediately after submission. You will no longer be able to edit your application after submission. However, you can edit your draft application until the end of the intake period.`
159-
: `Review of applications will begin on
158+
{isRollingIntake ? (
159+
<>
160+
Intake 6 is now open until June 30, 2025. If you are
161+
interested in submitting an application, or for any questions
162+
about connectivity projects in your area, please email{' '}
163+
<a href="mailto:connectedcommunitiesbc@gov.bc.ca">
164+
connectedcommunitiesbc@gov.bc.ca
165+
</a>
166+
</>
167+
) : (
168+
`Review of applications will begin on
160169
${dateTimeSubtracted(closeTimestamp, showSubtractedTime)}. You can
161-
edit draft and submitted applications until this date.`}
170+
edit draft and submitted applications until this date.`
171+
)}
162172
</p>
163173
) : (
164174
<div>
@@ -176,12 +186,22 @@ const Dashboard = ({
176186
</p>
177187
</div>
178188
)}
179-
<StyledGovButton
180-
onClick={handleCreateApplication}
181-
disabled={isCreateApplicationDisabled}
182-
>
183-
Create application
184-
</StyledGovButton>
189+
{!disableIntake ? (
190+
<StyledGovButton
191+
onClick={handleCreateApplication}
192+
disabled={isCreateApplicationDisabled || disableIntake}
193+
>
194+
Create application
195+
</StyledGovButton>
196+
) : (
197+
<StyledGovButton
198+
onClick={() => {
199+
window.location.href = 'mailto:support@example.com';
200+
}}
201+
>
202+
Email Us
203+
</StyledGovButton>
204+
)}
185205
</section>
186206
<section>
187207
{hasApplications ? (

app/pages/applicantportal/index.tsx

+15-16
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import Link from '@button-inc/bcgov-theme/Link';
77
import styled from 'styled-components';
88
import { useMemo } from 'react';
99
import { Button, Callout } from '@button-inc/bcgov-theme';
10-
import dateTimeSubtracted from 'utils/dateTimeSubtracted';
10+
// import dateTimeSubtracted from 'utils/dateTimeSubtracted';
1111
import { ButtonLink, DynamicAlert, Layout, LoginForm } from '../../components';
1212
import defaultRelayOptions from '../../lib/relay/withRelayOptions';
1313
import { applicantportalQuery } from '../../__generated__/applicantportalQuery.graphql';
@@ -76,11 +76,11 @@ const Home = ({
7676
getApplicantportalQuery,
7777
preloadedQuery
7878
);
79-
const isRollingIntake = openIntake?.rollingIntake || false;
79+
// const isRollingIntake = openIntake?.rollingIntake || false;
8080

8181
const openIntakeBanner = useFeature('open_intake_alert').value || {};
8282
const closedIntakeBanner = useFeature('closed_intake_alert').value || {};
83-
const showSubtractedTime = useFeature('show_subtracted_time').value || 0;
83+
// const showSubtractedTime = useFeature('show_subtracted_time').value || 0;
8484

8585
const intakeCalloutChildren = useMemo(() => {
8686
if (!openIntake)
@@ -96,22 +96,21 @@ const Home = ({
9696
</>
9797
);
9898

99-
const formattedClosingDate = dateTimeSubtracted(
100-
openIntake.closeTimestamp,
101-
showSubtractedTime
102-
);
99+
// const formattedClosingDate = dateTimeSubtracted(
100+
// openIntake.closeTimestamp,
101+
// showSubtractedTime
102+
// );
103103

104104
return (
105105
<BoldText>
106-
{`Applications will be accepted until ${formattedClosingDate}.`}
107-
<br />
108-
{isRollingIntake
109-
? `The review of applications will begin after submission.`
110-
: `Review of applications will not begin until this date.`}{' '}
111-
<br />
112-
{isRollingIntake
113-
? `Drafts will be editable until then.`
114-
: `Draft and submitted applications will be editable until then.`}
106+
<>
107+
Intake 6 is now open until June 30, 2025. <br />
108+
If you are interested in submitting an application, or for any
109+
questions about connectivity projects in your area, please email{' '}
110+
<a href="mailto:connectedcommunitiesbc@gov.bc.ca">
111+
connectedcommunitiesbc@gov.bc.ca
112+
</a>
113+
</>
115114
</BoldText>
116115
);
117116
}, [openIntake]);

0 commit comments

Comments
 (0)