HM-4871: Front page redirection (#1029)

* Create page to redirect to front page

* Redirect logged in user to front page when no redirect specified

* Update announcement banner link's target window

apps/marketplace/components/Header/Header.js

@@ -35,11 +35,7 @@ export class Header extends Component {
             <div className="wrapper">
               <div className="row">
                 <span className="maintenance-message">
-                  Digital Marketplace is moving to BuyICT soon.{' '}
-                  <a href="/api/2/r/buyict" target="_blank">
-                    Find out more
-                  </a>
-                  .
+                  Digital Marketplace is moving to BuyICT soon. <a href="/api/2/r/buyict">Find out more</a>.
                 </span>
               </div>
             </div>

apps/marketplace/pages/BuyICTPage.js

@@ -0,0 +1,13 @@
+import React from 'react'
+import LoadingIndicatorFullPage from 'shared/LoadingIndicatorFullPage/LoadingIndicatorFullPage'
+
+const BuyICTPage = () => {
+  window.location.replace('/')
+  return (
+    <React.Fragment>
+      <LoadingIndicatorFullPage />
+    </React.Fragment>
+  )
+}
+
+export default BuyICTPage

apps/marketplace/pages/LoginPage.js

@@ -34,7 +34,7 @@ export class LoginPageComponent extends BaseForm {
 
   render() {
     const { model, loggedIn, handleSubmit, currentlySending, isPartOfTeam, mustJoinTeam } = this.props
-    const { from } = this.props.location.state || { from: { pathname: `${rootPath}/opportunities` } }
+    const { from } = this.props.location.state || { from: { pathname: `${rootPath}/buyict` } }
 
     if (loggedIn && !isPartOfTeam && mustJoinTeam) {
       return <Redirect to={`${rootPath}/team/join`} />

apps/marketplace/routes.js

@@ -30,6 +30,7 @@ import BuyerATMFlowPage from './pages/BuyerATMFlowPage'
 import BuyerSpecialistCreatePage from './pages/BuyerSpecialistCreatePage'
 import BuyerSpecialistCompletedPage from './pages/BuyerSpecialistCompletedPage'
 import BuyerSpecialistFlowPage from './pages/BuyerSpecialistFlowPage'
+import BuyICTPage from './pages/BuyICTPage'
 import BriefOutcomeChoicePage from './pages/BriefOutcomeChoicePage'
 import CloseOpportunityPage from './pages/CloseOpportunityPage'
 import CloseOpportunitySuccessPage from './pages/CloseOpportunitySuccessPage'
@@ -232,6 +233,7 @@ export const Routes = () => (
       path={`${rootPath}/seller-assessment/:evidenceId/:stage?`}
       component={SellerAssessmentFlowPage}
     />
+    <Route path={`${rootPath}/buyict`} component={BuyICTPage} />
     <Route component={NotFound} />
   </Switch>
 )

src/bundles/Header/Header.js

@@ -164,11 +164,7 @@ class Header extends React.Component {
             <div className="wrapper">
               <div className="row">
                 <span className="maintenance-message">
-                  Digital Marketplace is moving to BuyICT soon.{' '}
-                  <a href="/api/2/r/buyict" target="_blank">
-                    Find out more
-                  </a>
-                  .
+                  Digital Marketplace is moving to BuyICT soon. <a href="/api/2/r/buyict">Find out more</a>.
                 </span>
               </div>
             </div>