Skip to content

Commit

Permalink
Merge pull request #541 from DFE-Digital/next
Browse files Browse the repository at this point in the history
Site renaming
  • Loading branch information
Maria-C1 authored Oct 29, 2024
2 parents 953daa8 + 52e21d6 commit de7246d
Show file tree
Hide file tree
Showing 15 changed files with 19 additions and 18,646 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/run-content-regression-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
env:
working-directory: ./browser-tests/content-regression-tests
PLAYWRIGHT_BASE_URL: https://${{ inputs.target_environment }}.develop-child-family-social-work-career.education.gov.uk/
PLAYWRIGHT_BASE_URL: https://${{ inputs.target_environment }}.support-for-social-workers.education.gov.uk/
defaults:
run:
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonarqube.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
/d:sonar.qualitygate.wait=true \
/d:sonar.cs.vscoveragexml.reportsPaths=coverage.xml \
/d:sonar.exclusions="**/*.css,**/*.scss,**/Models/*,**/Program.cs,**/WebApplicationBuilderExtensions.cs,**/GraphQL/Queries/*,**/Contentful-Schema/migrations/*.cjs" \
/d:sonar.test.exclusions="Childrens-Social-Care-CPD-Tests/**/*" \
/d:sonar.test.exclusions="Childrens-Social-Care-CPD-Tests/**/*,Terraform-bootstrap/Error-pages/*" \
/d:sonar.token="${{ secrets.SONAR_TOKEN }}" \
/d:sonar.host.url="https://sonarcloud.io"
dotnet build --no-incremental
Expand Down
2 changes: 1 addition & 1 deletion Childrens-Social-Care-CPD/Views/Error/404.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
If you pasted the web address, check you copied the entire address.
</p>
<p class="govuk-body">
If the web address is correct or you selected a link or button, <a href="mailto:develop-child-family-social-work-career-[email protected]" class="govuk-link">contact the Develop your career in child and family social work team</a> if you need to speak to someone.
If the web address is correct or you selected a link or button, <a href="mailto:support-for-social-workers-[email protected]" class="govuk-link">contact the Support for social workers team</a> if you need to speak to someone.
</p>
</div>
</div>
2 changes: 1 addition & 1 deletion Childrens-Social-Care-CPD/Views/Error/500.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<h1 class="govuk-heading-xl">Sorry, there is a problem with the service</h1>
<p class="govuk-body">Try again later.</p>
<p class="govuk-body">
<a class="govuk-link" href="mailto:develop-child-family-social-work-career-[email protected]">Contact the Develop your career in child and family social work team</a> if you need to speak to someone.
<a class="govuk-link" href="mailto:support-for-social-workers-[email protected]">Contact the Support for social workers team</a> if you need to speak to someone.
</p>
</div>
</div>
9,313 changes: 0 additions & 9,313 deletions Childrens-Social-Care-CPD/Views/HTMLFiles/403.html

This file was deleted.

9,314 changes: 0 additions & 9,314 deletions Childrens-Social-Care-CPD/Views/HTMLFiles/502.html

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
<span class="govuk-details__summary-text" data-ga4-expandable="">Request an accessible format</span>
</summary>
<div class="govuk-details__text">
If you use assistive technology (such as a screen reader) and need a version of this document in a more accessible format, please email <a href="mailto:develop-child-family-social-work-career-team@digital.education.gov.uk" target="_blank" class="govuk-link">develop-child-family-social-work-career-team@digital.education.gov.uk</a>. Please tell us what format you need. It will help us if you say what assistive technology you use.
If you use assistive technology (such as a screen reader) and need a version of this document in a more accessible format, please email <a href="mailto:support-for-social-workers-[email protected]" target="_blank" class="govuk-link">support-for-social-workers-team@education.gov.uk</a>. Please tell us what format you need. It will help us if you say what assistive technology you use.
</div>
</details>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
return;

var consentState = _cookieHelper.GetRequestAnalyticsCookieState(Context);
var headingText = "Cookies on Develop your career in child and family social work";
var headingText = "Cookies on Support for social workers";
var preferenceSet = ViewBag.ContextModel.PreferenceSet ?? false;
var request = Url.ActionContext.HttpContext.Request;

Expand Down
2 changes: 1 addition & 1 deletion Childrens-Social-Care-CPD/Views/Shared/_ErrorLayout.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<img src="/assets/images/dfe-logo.png" class="dfe-logo" alt="DfE Homepage">
<img src="/assets/images/dfe-logo-alt.png" class="dfe-logo-hover" alt="DfE Homepage">
<span class="dfe-header__service-name">
Develop your career in child and family social work
Support for social workers
</span>
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion Childrens-Social-Care-CPD/Views/Shared/_Header.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<img src="/assets/images/dfe-logo.png" class="dfe-logo" alt="DfE Homepage">
<img src="/assets/images/dfe-logo-alt.png" class="dfe-logo-hover" alt="DfE Homepage">
<span class="dfe-header__service-name">
Develop your career in child and family social work
Support for social workers
</span>
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This repository contains the code needed to host the Social Workforce career pro

## Live examples

The live site can be found [here](https://www.develop-child-family-social-work-career.education.gov.uk)
The live site can be found [here](https://www.support-for-social-workers.education.gov.uk)

## Nomenclature

Expand Down
8 changes: 4 additions & 4 deletions Terraform-bootstrap/Error-pages/403.html

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions Terraform-bootstrap/Error-pages/502.html

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ test.describe('Accessibility', () => {
})

test('CPD email address is visible @external', async ({ page }) => {
await expect(page.getByRole('link', { name: 'develop-child-family-social-work-career-team@digital.education.gov.uk' })).toBeVisible()
await expect(page.getByRole('link', { name: 'support-for-social-workers-[email protected]' })).toBeVisible()
})

test.describe('External links @external', () => {
Expand Down
2 changes: 1 addition & 1 deletion docs/StaticContents/StaticPages.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
This application uses two static HTML error pages with DFE branding style. These pages are used by the App gateway to show error
messages when service is down or App gateway not able to reach the web application.

Repository path - https://github.com/DFE-Digital/childrens-social-care-cpd/tree/master/Childrens-Social-Care-CPD/Views/HTMLFiles
Repository path - https://github.com/DFE-Digital/childrens-social-care-cpd/tree/main/Terraform-bootstrap/Error-pages

File Names:

Expand Down

0 comments on commit de7246d

Please sign in to comment.