Crown-Commercial-Service · ponselvamsakthivel-bc · Feb 6, 2023 · Jul 19, 2022 · Aug 19, 2022 · Aug 23, 2022
diff --git a/Auth0Templates/LogIn.html b/Auth0Templates/LogIn.html
@@ -421,6 +421,141 @@
     padding: 20px 17px 14px;
     font-weight: bold;
   }
+    .govuk-notification-banner {
+    font-family: "GDS Transport", arial, sans-serif;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+    font-weight: 400;
+    font-size: 16px;
+    font-size: 1rem;
+    line-height: 1.25;
+    margin-bottom: 30px;
+    border: 5px solid #1d70b8;
+    background-color: #1d70b8;
+    }
+
+    @media (min-width: 40.0625em) .govuk-notification-banner {
+    margin-bottom: 50px;
+    }
+
+    @media (min-width: 40.0625em) .govuk-notification-banner {
+    font-size: 19px;
+    font-size: 1.1875rem;
+    line-height: 1.3157894737;
+    }
+
+    @media (min-width: 40.0625em) .govuk-notification-banner__header {
+    padding: 2px 20px 5px;
+    }
+
+    .govuk-notification-banner__header {
+    padding: 2px 15px 5px;
+    border-bottom: 1px solid transparent;
+    }
+
+    @media (min-width: 40.0625em) .govuk-notification-banner__title {
+    font-size: 19px;
+    font-size: 1.1875rem;
+    line-height: 1.3157894737;
+    }
+
+    .govuk-notification-banner__title {
+    font-family: "GDS Transport", arial, sans-serif;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+    font-weight: 700;
+    font-size: 16px;
+    font-size: 1rem;
+    line-height: 1.25;
+    margin: 0;
+    padding: 0;
+    color: #ffffff;
+    }
+
+    @media (min-width: 40.0625em) .govuk-notification-banner__content {
+    padding: 20px;
+    }
+
+    .govuk-notification-banner__content {
+    color: #0b0c0c;
+    padding: 15px;
+    background-color: #ffffff;
+    }
+
+    .govuk-notification-banner__content> :last-child {
+    margin-bottom: 0;
+    }
+
+    .govuk-notification-banner__heading {
+    max-width: 100%;
+    }
+
+    @media (min-width: 40.0625em) .govuk-notification-banner__heading {
+    font-size: 24px;
+    font-size: 1.5rem;
+    line-height: 1.25;
+    }
+
+    @media (min-width: 40.0625em) .govuk-notification-banner__heading {
+    font-size: 24px !important;
+    font-size: 1.5rem;
+    line-height: 1.25;
+    }
+
+    @media (min-width: 40.0625em) .govuk-notification-banner {
+    font-size: 19px;
+    font-size: 1.1875rem;
+    line-height: 1.3157894737;
+    }
+
+    @media (min-width: 40.0625em) .govuk-notification-banner {
+    margin-bottom: 50px;
+    }
+
+    .govuk-notification-banner__title {
+    font-size: 19px;
+    font-size: 1.1875rem;
+    line-height: 1.3157894737;
+    }
+
+    .govuk-notification-banner__heading {
+    font-size: 24px;
+    font-size: 1.5rem;
+    line-height: 1.25;
+    font-weight: 700;
+    }
+
+    .govuk-notification-banner__link:link {
+    color: #1d70b8;
+    }
+
+    .govuk-notification-banner__link {
+    font-family: "GDS Transport", arial, sans-serif;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+    text-decoration: underline;
+    text-decoration-thickness: max(1px, 0.0625rem);
+    text-underline-offset: 0.1em;
+    }
+
+    .govuk-notification-banner__link {
+    font-size: 1.5rem;
+    line-height: 1.25;
+    font-weight: 700;
+    color: #1d70b8;
+    }
+
+    .govuk-notification-banner__link:hover {
+    color: #003078;
+    text-decoration-thickness: max(3px, .1875rem, .12em);
+    -webkit-text-decoration-skip-ink: none;
+    text-decoration-skip-ink: none;
+    -webkit-text-decoration-skip: none;
+    text-decoration-skip: none;
+    }
+    .govuk-link:visited, a:visited {
+        color: #1d70b8;
+    }
 </style>
 
 <body class="govuk-template__body show-flourishes pillar--none js-enabled">
@@ -537,6 +672,19 @@ <h2 class="govuk-cookie-banner__heading govuk-heading-m">Cookies on Public Procu
     </div>
 
     <div class="govuk-main-wrapper login-container">
+        <div class="govuk-notification-banner" role="region" aria-labelledby="govuk-notification-banner-title" data-module="govuk-notification-banner">
+            <div class="govuk-notification-banner__header">
+              <h2 class="govuk-notification-banner__title" id="govuk-notification-banner-title">
+                Terms of use
+              </h2>
+            </div>
+            <div class="govuk-notification-banner__content">
+              <p class="govuk-notification-banner__heading">
+                The terms of use for the Public Procurement Gateway have changed.
+                <a class="govuk-notification-banner__link" href="https://dev.identify.crowncommercial.gov.uk/terms-of-use">Read the updated terms of use</a>.
+              </p>
+            </div>
+          </div>
         <h1 class="govuk-heading-xl">Sign in to the Public Procurement Gateway</h1>
 
         <div class="govuk-error-summary" aria-labelledby="error-summary-title" role="alert" tabindex="-1"

diff --git a/e2e/tsconfig.json b/e2e/tsconfig.json
@@ -1,4 +1,3 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
   "extends": "../tsconfig.json",
   "compilerOptions": {

diff --git a/nginx.conf b/nginx.conf
@@ -66,7 +66,9 @@ http {
         error_page 404 /index.html;
 
     }
-
+    location ~ .html$ {
+      add_header Cache-Control no-cache;
+    }
 
     add_header Strict-Transport-Security 'max-age=31536000; includeSubDomains; preload';
     add_header X-XSS-Protection "1; mode=block";
@@ -82,4 +84,4 @@ http {
       }
 
   }
-}
+}
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
@@ -125,6 +125,18 @@ import { DelegatedUserActivationComponent } from './pages/manage-delegated/landi
 import { DelegatedOrganisationComponent } from './pages/manage-delegated/user/delegated-organisation/delegated-organisation.component';
 import { TermsConditionsComponent } from './components/terms-conditions/terms-conditions.component';
 import { ForgotPasswordErrorComponent } from './pages/forgot-password-error/forgot-password-error.component';
+import { ViewPendingVerificationComponent } from './pages/manage-buyer-and-both-requests/view-pending-verification/view-pending-verification.component';
+import { ViewVerifiedOrgComponent } from './pages/manage-buyer-and-both-requests/view-verified-org/view-verified-org.component';
+import { UpdateOrgTypeComponent } from './pages/buyer/update-org-type/update-org-type.component';
+import { AutoValidationBuyerSuccessComponent } from './pages/buyer/auto-validation-buyer-success/auto-validation-buyer-success.component';
+import { ConfirmOrgTypeComponent } from './pages/buyer/confirm-org-type/confirm-org-type.component';
+import { ConfirmDeclineComponent } from './pages/manage-buyer-and-both-requests/confirm-decline/confirm-decline.component';
+import { BuyerBothRequestsComponent } from './pages/manage-buyer-and-both-requests/buyer-both-requests/buyer-both-requests.component';
+import { ConfirmAcceptComponent } from './pages/manage-buyer-and-both-requests/confirm-accept/confirm-accept.component';
+import { RemoveRightToBuyComponent } from './pages/manage-buyer-and-both-requests/remove-right-to-buy/remove-right-to-buy.component';
+import { SuccessRightToBuyComponent } from './pages/manage-buyer-and-both-requests/success-right-to-buy/success-right-to-buy.component';
+import { BuyerBothRequestsSuccessComponent } from './pages/manage-buyer-and-both-requests/buyer-both-requests-success/buyer-both-requests-success.component';
+import { BuyerBothErrorComponent } from './pages/manage-buyer-and-both-requests/buyer-both-error/buyer-both-error.component';
 
 const routes: Routes = [
   { path: '', redirectTo: 'home', pathMatch: 'full' },
@@ -692,6 +704,20 @@ const routes: Routes = [
     canActivate: [AuthGuard, RoleGuard],
     component: BuyerConfirmComponent,
   },
+  {
+    path: 'update-org-type/confirm',
+    data: { title: 'Review - Manage Buyers', roles: ['MANAGE_SUBSCRIPTIONS'] },
+    pathMatch: 'full',
+    canActivate: [AuthGuard, RoleGuard],
+    component: UpdateOrgTypeComponent,
+  },
+  {
+    path: 'update-org-type/buyer-success/:id',
+    data: { title: 'Review - Manage Buyers', roles: ['MANAGE_SUBSCRIPTIONS'] },
+    pathMatch: 'full',
+    canActivate: [AuthGuard, RoleGuard],
+    component: AutoValidationBuyerSuccessComponent,
+  },
   {
     path: 'buyer/confirm-changes/:id',
     data: {
@@ -702,6 +728,16 @@ const routes: Routes = [
     canActivate: [AuthGuard, RoleGuard],
     component: BuyerConfirmChangesComponent,
   },
+  {
+    path: 'update-org-type/confirm-changes',
+    data: {
+      title: 'Confirm Changes - Manage Buyers',
+      roles: ['MANAGE_SUBSCRIPTIONS'],
+    },
+    pathMatch: 'full',
+    canActivate: [AuthGuard, RoleGuard],
+    component: ConfirmOrgTypeComponent,
+  },
   {
     path: 'buyer/error',
     data: { title: 'Error - Manage Buyers', roles: ['MANAGE_SUBSCRIPTIONS'] },
@@ -1009,6 +1045,71 @@ const routes: Routes = [
     pathMatch: 'full',
     component: DelegatedErrorComponent,
   },
+  {
+    path: 'manage-buyer-both',
+    data: { title: 'Manage Buyer status Requests',roles: ['MANAGE_SUBSCRIPTIONS'] },
+    pathMatch: 'full',
+    canActivate: [AuthGuard, RoleGuard],
+    component: BuyerBothRequestsComponent,
+  },
+  {
+    path: 'confirm-decline',
+    data: { title: 'Decline right to buy status',
+    roles: ['MANAGE_SUBSCRIPTIONS'] },
+    pathMatch: 'full',
+    canActivate: [AuthGuard, RoleGuard],
+    component: ConfirmDeclineComponent,
+
+  },
+  {
+    path: 'confirm-accept',
+    data: { title: 'Approve right to buy status',roles: ['MANAGE_SUBSCRIPTIONS'] },
+    pathMatch: 'full',
+    canActivate: [AuthGuard, RoleGuard],
+    component: ConfirmAcceptComponent,
+  },
+  {
+    path: 'pending-verification',
+    data: { title: 'Manage Buyer status requests - View request',roles: ['MANAGE_SUBSCRIPTIONS'] },
+    pathMatch: 'full',
+    canActivate: [AuthGuard, RoleGuard],
+    component: ViewPendingVerificationComponent,
+  },
+  {
+    path: 'verified-organisations',
+    data: { title: 'Manage Buyer status requests - View Buyer status for the organisation' ,roles: ['MANAGE_SUBSCRIPTIONS']},
+    pathMatch: 'full',
+    canActivate: [AuthGuard, RoleGuard],
+    component: ViewVerifiedOrgComponent,
+  },
+  {
+    path: 'remove-right-to-buy',
+    data: { title: 'Remove right to buy status',roles: ['MANAGE_SUBSCRIPTIONS'] },
+    pathMatch: 'full',
+    canActivate: [AuthGuard, RoleGuard],
+    component: RemoveRightToBuyComponent,
+  },
+  {
+    path: 'remove-right-to-buy-success',
+    data: { title: 'Remove right to buy status – success',roles: ['MANAGE_SUBSCRIPTIONS'] },
+    pathMatch: 'full',
+    canActivate: [AuthGuard, RoleGuard],
+    component: SuccessRightToBuyComponent,
+  },
+  {
+    path: 'buyer-and-both-success',
+    pathMatch: 'full',
+    data: { roles: ['MANAGE_SUBSCRIPTIONS'] },
+    canActivate: [AuthGuard, RoleGuard],
+    component: BuyerBothRequestsSuccessComponent,
+  },
+  {
+    path: 'buyer-and-both-fail',
+    pathMatch: 'full',
+    data: { roles: ['MANAGE_SUBSCRIPTIONS'] },
+    canActivate: [AuthGuard, RoleGuard],
+    component: BuyerBothErrorComponent,
+  },
   {
     path: 'terms-of-use',
     data: { title: 'Terms of Use' },

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -175,6 +175,18 @@ import { DelegatedUserActivationComponent } from './pages/manage-delegated/landi
 import { DelegatedOrganisationComponent } from './pages/manage-delegated/user/delegated-organisation/delegated-organisation.component';
 import { TermsConditionsComponent } from './components/terms-conditions/terms-conditions.component';
 import { ForgotPasswordErrorComponent } from './pages/forgot-password-error/forgot-password-error.component';
+import { BuyerBothRequestsComponent } from './pages/manage-buyer-and-both-requests/buyer-both-requests/buyer-both-requests.component';
+import { ConfirmDeclineComponent } from './pages/manage-buyer-and-both-requests/confirm-decline/confirm-decline.component';
+import { BuyerBothRequestsSuccessComponent } from './pages/manage-buyer-and-both-requests/buyer-both-requests-success/buyer-both-requests-success.component';
+import { ConfirmAcceptComponent } from './pages/manage-buyer-and-both-requests/confirm-accept/confirm-accept.component';
+import { ViewPendingVerificationComponent } from './pages/manage-buyer-and-both-requests/view-pending-verification/view-pending-verification.component';
+import { ViewVerifiedOrgComponent } from './pages/manage-buyer-and-both-requests/view-verified-org/view-verified-org.component';
+import { RemoveRightToBuyComponent } from './pages/manage-buyer-and-both-requests/remove-right-to-buy/remove-right-to-buy.component';
+import { SuccessRightToBuyComponent } from './pages/manage-buyer-and-both-requests/success-right-to-buy/success-right-to-buy.component';
+import { UpdateOrgTypeComponent } from './pages/buyer/update-org-type/update-org-type.component';
+import { ConfirmOrgTypeComponent } from './pages/buyer/confirm-org-type/confirm-org-type.component';
+import { AutoValidationBuyerSuccessComponent } from './pages/buyer/auto-validation-buyer-success/auto-validation-buyer-success.component';
+import { BuyerBothErrorComponent } from './pages/manage-buyer-and-both-requests/buyer-both-error/buyer-both-error.component';
 
 export function HttpLoaderFactory(http: HttpClient) {
   return new TranslateHttpLoader(http);
@@ -315,7 +327,19 @@ export function createTranslateLoader(http: HttpClient) {
     DelegatedUserActivationComponent,
     DelegatedOrganisationComponent,
     TermsConditionsComponent,
-    ForgotPasswordErrorComponent
+    ForgotPasswordErrorComponent,
+    BuyerBothRequestsComponent,
+    ConfirmDeclineComponent,
+    BuyerBothRequestsSuccessComponent,
+    ConfirmAcceptComponent,
+    ViewPendingVerificationComponent,
+    ViewVerifiedOrgComponent,
+    RemoveRightToBuyComponent,
+    SuccessRightToBuyComponent,
+    UpdateOrgTypeComponent,
+    ConfirmOrgTypeComponent,
+    AutoValidationBuyerSuccessComponent,
+    BuyerBothErrorComponent
   ],
   imports: [
     // BrowserModule,