diff --git a/src/app/components/pages/IsaacCompetition/Buttons/CompetitionButton.tsx b/src/app/components/pages/IsaacCompetition/Buttons/CompetitionButton.tsx index 4ec983f094..f4e5d2b0da 100644 --- a/src/app/components/pages/IsaacCompetition/Buttons/CompetitionButton.tsx +++ b/src/app/components/pages/IsaacCompetition/Buttons/CompetitionButton.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Button, Col, Row } from "reactstrap"; +import { Button } from "reactstrap"; import { useHistory, useLocation } from "react-router-dom"; import { persistence, KEY } from "../../../../services"; @@ -28,15 +28,13 @@ const CompetitionButton = ({ buttons }: CompetitionButtonProps) => { }; return ( - + <> {buttons.map(({ to, label }) => ( - - - + ))} - + ); }; diff --git a/src/app/components/pages/IsaacCompetition/EntryForm/EntryFormHandler.tsx b/src/app/components/pages/IsaacCompetition/EntryForm/EntryFormHandler.tsx index 1ca9bbff33..5fde048832 100644 --- a/src/app/components/pages/IsaacCompetition/EntryForm/EntryFormHandler.tsx +++ b/src/app/components/pages/IsaacCompetition/EntryForm/EntryFormHandler.tsx @@ -7,6 +7,12 @@ import { isStudent, isAdmin, isTeacher } from "../../../../services"; import CompetitionWrapper from "../CompetitionWrapper"; import { CLOSED_MESSAGE, STUDENT_MESSAGE, TEACHER_MESSAGE } from "../constants"; +// EOI button configuration - same as HomepageHighlight +export const eoiButton = { + to: "https://forms.cloud.microsoft/e/K4GmaA3QEF", + label: "Express your interest", +}; + const StudentMessage = () => ( @@ -36,12 +42,6 @@ interface EntryFormHandlerProps { const EntryFormHandler = ({ buttons, handleTermsClick }: EntryFormHandlerProps) => { const user = useAppSelector(selectors.user.orNull); - // EOI button configuration - same as HomepageHighlight - const eoiButton = { - to: "https://forms.office.com/e/23bsQuZfjm", - label: "Express your interest", - }; - const renderEntryForm = () => { // Revert this: Only ADMIN users can see and submit the competition form if (isAdmin(user) || isTeacher(user)) { @@ -59,13 +59,8 @@ const EntryFormHandler = ({ buttons, handleTermsClick }: EntryFormHandlerProps) return ( - - - - - } + // EOI button is rendered in the headline text column for correct alignment + beforeCompetitionOpenContent={null} closedCompetitionContent={ diff --git a/src/app/components/pages/IsaacCompetition/HomepageHighlight/HomepageHighlight.tsx b/src/app/components/pages/IsaacCompetition/HomepageHighlight/HomepageHighlight.tsx index a3618795f5..638e4c8f56 100644 --- a/src/app/components/pages/IsaacCompetition/HomepageHighlight/HomepageHighlight.tsx +++ b/src/app/components/pages/IsaacCompetition/HomepageHighlight/HomepageHighlight.tsx @@ -13,8 +13,12 @@ const HomepageHighlight = () => { const getBannerContent = () => { if (isBeforeCompetitionOpenDate(currentDate)) { return { - subtitle: - "Some users are experiencing issues when attempting questions on mobile devices, including iPads. Please use a computer for now if possible while we fix this. Thank you for your patience.", + title: "National Computer Science Competition 2026/27", + subtitle: "Opening October 2026", + button: { + to: "https://forms.cloud.microsoft/e/K4GmaA3QEFn", + label: "Be the first one to know", + }, }; } else if (isAfterCompetitionOpenDateAndBeforeCompetitionEndDate(currentDate)) { return { diff --git a/src/app/components/pages/IsaacCompetition/IsaacCompetition.tsx b/src/app/components/pages/IsaacCompetition/IsaacCompetition.tsx index afb3928810..e27b3475fa 100644 --- a/src/app/components/pages/IsaacCompetition/IsaacCompetition.tsx +++ b/src/app/components/pages/IsaacCompetition/IsaacCompetition.tsx @@ -7,7 +7,9 @@ import "../../../../scss/cs/competition.scss"; import Accordion from "./Accordion/Accordion"; import InformationCard from "./CompetitionInformation/InformationCard"; import CompetitionTimeline from "./CompetitionInformation/CompetitionTimeline"; -import EntryFormHandler from "./EntryForm/EntryFormHandler"; +import EntryFormHandler, { eoiButton } from "./EntryForm/EntryFormHandler"; +import CompetitionButton from "./Buttons/CompetitionButton"; +import CompetitionWrapper from "./CompetitionWrapper"; import { liveQandASessionDate } from "./dateUtils"; const { section1, section3, accordion } = content; @@ -66,7 +68,7 @@ export const IsaacCompetition = () => {
- +

National Computer Science Competition

{section1.header.section1}

@@ -92,7 +94,13 @@ export const IsaacCompetition = () => { {` ${section1.note.callToAction}`}

- + + + }> + {null} + + + National Competition page after this date. -export const COMPETITION_OPEN_DATE = new Date("2026-05-20T23:59:59Z"); // UTC timezone +export const COMPETITION_OPEN_DATE = new Date("2026-09-30T23:59:59Z"); // UTC timezone //The Entries open banner will be displayed till midnight on 28 Feb 2026. Entries closed banner will be displayed after this till ENTRIES_CLOSED_BANNER_END_DATE export const COMPETITION_END_DATE = new Date("2026-02-28T23:59:59Z"); // UTC timezone diff --git a/src/scss/cs/homepage.scss b/src/scss/cs/homepage.scss index 6c83b045b5..5c49cb5cb7 100644 --- a/src/scss/cs/homepage.scss +++ b/src/scss/cs/homepage.scss @@ -300,6 +300,7 @@ // ---------------------------------------------- .homepage-highlight { + padding-top: 30px; background-color: #ffdf80; &-title {