merged in new changes

Author: fangedShadow

public/header.png

@@ -0,0 +1,15 @@
+import { FETCH_FORM_DATA, SET_FORM_DATA } from "../constants/hgnFormConstants"
+
+
+export const fetchformData=()=>{
+    return async dispatch=>{
+        dispatch({
+            type:FETCH_FORM_DATA
+        })
+    }
+}
+
+export const setformData=(data)=>({
+    type:SET_FORM_DATA,
+    payload:data
+})

src/actions/hgnFormAction.js

@@ -93,6 +93,7 @@ function BMLogin(props) {
         <FormText>
           Enter your current user credentials to access the Building Management Dashboard
         </FormText>
+        <p>Note: You must use your Production/Main credentials for this login.</p>
         <FormGroup>
           <Label for="email">Email</Label>
           <Input

src/components/BMDashboard/Login/BMLogin.jsx

@@ -91,6 +91,12 @@ describe('BMLogin component', () => {
       ),
     ).toBeInTheDocument();
   });
+  it('check if Note: You must use your Production/Main credentials for this login. header displays as expected', () => {
+    renderComponent(store);
+    expect(
+      screen.getByText('Note: You must use your Production/Main credentials for this login.'),
+    ).toBeInTheDocument();
+  });
   it('check if email label is displaying as expected', () => {
     renderComponent(store);
     expect(screen.getByText('Email')).toBeInTheDocument();

src/components/BMDashboard/Login/__tests__/BMLogin.test.js

@@ -93,6 +93,7 @@ function CPLogin(props) {
         <FormText>
           Enter your current user credentials to access the Community Portal Dashboard
         </FormText>
+        <p>Note: You must use your Production/Main credentials for this login.</p>
         <FormGroup>
           <Label for="email">Email</Label>
           <Input

src/components/CommunityPortal/Login/CPLogin.jsx

@@ -91,6 +91,12 @@ describe('CPLogin component', () => {
       ),
     ).toBeInTheDocument();
   });
+  it('check if Note: You must use your Production/Main credentials for this login. header displays as expected', () => {
+    renderComponent(store);
+    expect(
+      screen.getByText('Note: You must use your Production/Main credentials for this login.'),
+    ).toBeInTheDocument();
+  });
   it('check if email label is displaying as expected', () => {
     renderComponent(store);
     expect(screen.getByText('Email')).toBeInTheDocument();

src/components/CommunityPortal/Login/__tests__/CPLogin.test.js

@@ -91,6 +91,7 @@ function EPLogin(props) {
       <h2>Log In To Good Education Portal</h2>
       <Form onSubmit={handleSubmit}>
         <FormText>Enter your current user credentials to access the Good Education Portal</FormText>
+        <p>Note: You must use your Production/Main credentials for this login.</p>
         <FormGroup>
           <Label for="email">Email</Label>
           <Input

src/components/EductionPortal/Login/EPLogin.jsx

@@ -89,6 +89,12 @@ describe('EPLogin component', () => {
       screen.getByText('Enter your current user credentials to access the Good Education Portal'),
     ).toBeInTheDocument();
   });
+  it('check if Note: You must use your Production/Main credentials for this login. header displays as expected', () => {
+    renderComponent(store);
+    expect(
+      screen.getByText('Note: You must use your Production/Main credentials for this login.'),
+    ).toBeInTheDocument();
+  });
   it('check if email label is displaying as expected', () => {
     renderComponent(store);
     expect(screen.getByText('Email')).toBeInTheDocument();

src/components/EductionPortal/Login/__tests__/EPLogin.test.js

@@ -0,0 +1,27 @@
+import { useEffect } from 'react';
+import { useDispatch } from 'react-redux';
+import { getUserProfileBasicInfo } from 'actions/userManagement';
+import Banner from '../questionpages/Banner';
+import QuestionnaireInfo from '../questionpages/QuestionnaireInfo';
+import InfoForm from '../questionpages/InfoForm';
+import Progress from '../questionpages/Progress';
+import '../styles/hgnform.css';
+
+function Page1() {
+  const dispatch = useDispatch();
+  dispatch(getUserProfileBasicInfo());
+  useEffect(() => {
+    window.scrollTo(0, 0);
+  }, []);
+
+  return (
+    <div className="hgnform">
+      <Banner />
+      <QuestionnaireInfo />
+      <InfoForm />
+      <Progress progressValue={16.67 * 1} />
+    </div>
+  );
+}
+
+export default Page1;

src/components/HGNForm/pages/Page1.js

@@ -0,0 +1,26 @@
+import { useEffect, useRef } from 'react';
+import Banner from '../questionpages/Banner';
+import Progress from '../questionpages/Progress';
+import QuestionnaireHeader from '../questionpages/QuestionnaireHeader';
+import GeneralQuestions from '../questionpages/GeneralQuestions';
+
+function Page2() {
+  const headerRef = useRef(null);
+
+  useEffect(() => {
+    if (headerRef.current) {
+      headerRef.current.scrollIntoView({ behavior: 'auto', block: 'start' });
+    }
+  }, []);
+
+  return (
+    <div className="hgnform">
+      <Banner />
+      <QuestionnaireHeader ref={headerRef} />
+      <GeneralQuestions />
+      <Progress progressValue={16.67 * 2} />
+    </div>
+  );
+}
+
+export default Page2;