Merge pull request #45 from cabinetoffice/NTRNL-382-update-home-page-…

…based-on-ux-design Ntrnl 382 update home page based on ux design
cabinetoffice · Mar 6, 2024 · d767d2b · d767d2b
2 parents 61fdc2a + 2d51e74
commit d767d2b
Show file tree

Hide file tree

Showing 22 changed files with 20 additions and 653 deletions.
diff --git a/src/config/index.ts b/src/config/index.ts
@@ -1,6 +1,6 @@
 import { getEnvironmentValue } from '../utils/getEnvironmentValue';
 
-export const SERVICE_NAME = 'GitHub Requests Application ';
+export const SERVICE_NAME = 'GitHub Requests';
 
 export const PATH_SSL_PRIVATE_KEY = getEnvironmentValue('PATH_SSL_PRIVATE_KEY', 'false');
 export const PATH_SSL_CERTIFICATE = getEnvironmentValue('PATH_SSL_CERTIFICATE', 'false');
@@ -19,31 +19,25 @@ export const START = 'start';
 export const HOME = 'home';
 export const ADD_MEMBER = 'add-member';
 export const REMOVE_MEMBER = 'remove-member';
-export const MEMBER_REQUST = 'member-request';
 export const NOT_FOUND = 'page-not-found';
 export const NOT_AVAILABLE = 'not-available';
 export const ERROR_PAGE = 'error';
 export const CONFIRMATION = 'confirmation';
 export const ADD_TEAM = 'add-team';
-export const TEAM_REQUEST = 'team-request';
 export const ADD_TEAM_MEMBER = 'add-team-member';
 export const ADD_REPO = 'add-repo';
-export const REPO_REQUEST = 'repo-request';
 
 // Routing paths
 
 export const START_URL = '/start';
 export const HOME_URL = '/home';
 export const ADD_MEMBER_URL = '/add-member';
 export const REMOVE_MEMBER_URL = '/remove-member';
-export const MEMBER_REQUST_URL = '/member-request';
 export const HEALTHCHECK_URL = '/healthcheck';
 export const CONFIRMATION_URL = '/confirmation';
 export const ADD_TEAM_URL = '/add-team';
-export const TEAM_REQUEST_URL = '/team-request';
 export const ADD_TEAM_MEMBER_URL = '/add-team-member';
 export const ADD_REPO_URL = '/add-repo';
-export const REPO_REQUEST_URL = '/repo-request';
 
 export const SERVICE_URL = `${BASE_URL}${CONFIRMATION_URL}`;
 

diff --git a/src/controller/member-request.controller.ts b/src/controller/member-request.controller.ts
diff --git a/src/controller/repo-request.controller.ts b/src/controller/repo-request.controller.ts
diff --git a/src/controller/team-request.controller.ts b/src/controller/team-request.controller.ts
diff --git a/src/routes/index.ts b/src/routes/index.ts
@@ -10,10 +10,7 @@ import addRepoRouter from './add-repo';
 import addMemberRouter from './add-member';
 import addTeamRouter from './add-team';
 import removeMemberRouter from './remove-member';
-import teamRequestRouter from './team-request';
 import addTeamMemberRouter from './add-team-member';
-import memberRequestRouter from './member-request';
-import repoRequestRouter from './repo-request';
 
 const router = Router();
 
@@ -29,9 +26,6 @@ router.use(healthcheckRouter);
 router.use(addRepoRouter);
 router.use(addTeamRouter);
 router.use(removeMemberRouter);
-router.use(teamRequestRouter);
 router.use(addTeamMemberRouter);
-router.use(memberRequestRouter);
-router.use(repoRequestRouter);
 
 export default router;
diff --git a/src/routes/member-request.ts b/src/routes/member-request.ts
diff --git a/src/routes/repo-request.ts b/src/routes/repo-request.ts
diff --git a/src/routes/team-request.ts b/src/routes/team-request.ts
diff --git a/src/validation/member-request.validation.ts b/src/validation/member-request.validation.ts
diff --git a/src/validation/repo-request.validation.ts b/src/validation/repo-request.validation.ts
diff --git a/src/validation/team-request.validation.ts b/src/validation/team-request.validation.ts
diff --git a/src/views/home.html b/src/views/home.html
@@ -3,53 +3,42 @@
 {% block content %}
 
 <div class="govuk-width-container">
-
   <main class="govuk-main-wrapper">
     <div class="govuk-grid-row">
       <div class="govuk-grid-column-two-thirds">
-
-        <h1 class="govuk-heading-l">GitHub request application</h1>
-        <p class="govuk-body">This application has been designed to streamline and enhance the management of GitHub member requests. This tool will allow GitHub administrators to efficiently handle member-related tasks, including adding, deleting, and amending user permissions.</p>
-        <h1 class="govuk-heading-m">
-          Please choose from one of the following options:
-      </h1>
-        <h2 class="govuk-heading-s">Member Requests</h2>
-        <ul class="govuk-list--bullet govuk-list--spaced govuk-link">
+        <h1 class="govuk-heading-l">GitHub Requests</h1>
+        <p class="govuk-body">You can use this service to make requests to your GitHub organisation. You can make multiple requests at once, with all requests displayed in a summary table at the bottom of this page.</p>
+        <h2 class="govuk-heading-m">General requests</h2>
+        <ul class="govuk-list govuk-list--bullet govuk-list--spaced">
           <li>
-            <a class="govuk-link" href="/add-member">Add Member</a>
+            <a class="govuk-link" href="/add-member">Add a new member</a>
           </li>
           <li>
-            <a class="govuk-link" href="/remove-member">Remove Member</a>
+            <a class="govuk-link" href="/add-team">Add a new team</a>
           </li>
           <li>
-            <a class="govuk-link" href="/member-request">Additional Member Requests (e.g permission change)</a>
-          </li>
-        </ul>
-        <br>
-        <h2 class="govuk-heading-s">Team Requests</h2>
-        <ul class="govuk-list--bullet govuk-list--spaced govuk-link">
-          <li>
-            <a class="govuk-link" href="/add-team">Add Team</a>
+            <a class="govuk-link" href="/add-team-member">Add existing member(s) to a team</a>
           </li>
           <li>
-            <a class="govuk-link" href="/add-team-member">Add Member Per Team</a>
+            <a class="govuk-link" href="/add-repo">Add a new repository</a>
           </li>
           <li>
-            <a class="govuk-link" href="/team-request">Additional Team Requests (e.g parent team)</a>
+            <a class="govuk-link" href="/add-collaborator">Add a new collaborator to a repository</a>
           </li>
         </ul>
-        <br>
-        <h2 class="govuk-heading-s">Repository requests</h2>
-        <ul class="govuk-list--bullet govuk-list--spaced govuk-link">
+        <h2 class="govuk-heading-m">Additional requests</h2>
+        <p class="govuk-body">
+          Make additional requests that are not covered by the other options,
+          for example, removal requests or permission changes.
+        </p>
+        <ul class="govuk-list govuk-list--bullet govuk-list--spaced">
           <li>
-            <a class="govuk-link" href="/add-repo">Add Repository</a>
-          </li>
-          <li>
-            <a class="govuk-link" href="/repo-request">Additional Repository Requests (e.g permission changes)</a>
+            <a class="govuk-link" href="/additional-requests">Additional requests</a>
           </li>
         </ul>
       </div>
     </div>
   </main>
 </div>
-{% endblock %}
+
+{% endblock %}
diff --git a/src/views/member-request.html b/src/views/member-request.html
diff --git a/src/views/repo-request.html b/src/views/repo-request.html
diff --git a/src/views/team-request.html b/src/views/team-request.html