Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
8e6c810
Bump @babel/core from 7.27.3 to 7.27.4 in /Auth/LearningHub.Nhs.Auth
dependabot[bot] Jun 2, 2025
d82e9aa
Bump sass from 1.89.0 to 1.89.1 in /Auth/LearningHub.Nhs.Auth (#185)
dependabot[bot] Jun 2, 2025
9d3aee1
Enabled central package management
Jun 3, 2025
03ea146
Added nuget.config file
Jun 6, 2025
7ab67b0
Bump core-js from 3.42.0 to 3.43.0 in /Auth/LearningHub.Nhs.Auth (#187)
dependabot[bot] Jun 10, 2025
871b86e
Bump sass from 1.89.1 to 1.89.2 in /Auth/LearningHub.Nhs.Auth (#188)
dependabot[bot] Jun 10, 2025
8e3adf0
Update continuous-integration-workflow.yml
binon Jun 12, 2025
0b6c5c3
Merge pull request #192 from TechnologyEnhancedLearning/Develop/Featu…
binon Jun 17, 2025
63a8b3e
Bump AutoMapper and 19 others
dependabot[bot] Jun 17, 2025
43de1f0
upgrading database proj version
Jun 17, 2025
99311fb
Merge branch 'Automatic_version_update_dependabot' of https://github.…
Jun 17, 2025
ff92ec7
Merge pull request #193 from TechnologyEnhancedLearning/dependabot/nu…
binon Jun 17, 2025
6662c01
Bump AutoMapper and 7 others
dependabot[bot] Jun 17, 2025
89c6c1a
Merge pull request #194 from TechnologyEnhancedLearning/dependabot/nu…
binon Jun 17, 2025
7de18de
Adding solution file
Jun 17, 2025
c609933
Bump AutoMapper and 4 others
dependabot[bot] Jun 17, 2025
c21d59d
Merge pull request #195 from TechnologyEnhancedLearning/dependabot/nu…
binon Jun 17, 2025
32b7e78
Merge pull request #196 from TechnologyEnhancedLearning/Automatic_ver…
binon Jun 17, 2025
8f19031
Merge pull request #184 from TechnologyEnhancedLearning/dependabot/np…
AnjuJose011 Jun 17, 2025
ea05df7
Merge pull request #197 from TechnologyEnhancedLearning/Automatic_ver…
AnjuJose011 Jun 17, 2025
9b0e3e7
Update Directory.Packages.props -Automapper
AnjuJose011 Jun 18, 2025
f56f1bd
Added client config section for moodlepgvle
ColinBeebyHEE Jun 18, 2025
434f9d7
Merge pull request #199 from TechnologyEnhancedLearning/Develop/Fixes…
AnjuJose011 Jun 18, 2025
d9e214f
Revert "Automatic version update dependabot To RC"
AnjuJose011 Jul 2, 2025
25f997d
Merge pull request #205 from TechnologyEnhancedLearning/revert-197-Au…
AnjuJose011 Jul 2, 2025
0b2189b
Fixes
AnjuJose011 Jul 2, 2025
37353fe
Merge pull request #206 from TechnologyEnhancedLearning/Reverting-CPM…
AnjuJose011 Jul 2, 2025
3193e5a
TD-5752: Issue showing 'Your password has been changed' when logged o…
swapnamol-abraham Jul 14, 2025
5a04fe5
Merge pull request #214 from TechnologyEnhancedLearning/Develop/Fixes…
swapnamol-abraham Jul 14, 2025
de78ea1
Added moodlemooc stanza to appsettings.json
ColinBeebyHEE Jul 16, 2025
162f4d4
Merge pull request #217 from TechnologyEnhancedLearning/Develop/Fixes…
AnjuJose011 Jul 17, 2025
24d6522
TD-5752: # Need to revert the code # Code to test the logout issue fr…
swapnamol-abraham Jul 23, 2025
b58df6a
consolidate .nhsuk overrides into new scss file
frank-hee Jul 31, 2025
98f85e4
auto formatting new code
frank-hee Jul 31, 2025
e395ca7
Merge pull request #222 from TechnologyEnhancedLearning/Develop/Featu…
AnjuJose011 Aug 7, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/continuous-integration-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ jobs:
dotnet-version: 8.0.x

- name: Add Azure artifact
run: dotnet nuget add source 'https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json' --name 'LearningHubFeed' --username 'kevin.whittaker' --password ${{ secrets.AZURE_DEVOPS_PAT }} --store-password-in-clear-text
run: |
dotnet nuget remove source LearningHubFeed || true
dotnet nuget add source 'https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json' --name 'LearningHubFeed' --username 'kevin.whittaker' --password ${{ secrets.AZURE_DEVOPS_PAT }} --store-password-in-clear-text

- name: Use NuGet 5.8
uses: nuget/setup-nuget@v1
Expand Down
2 changes: 1 addition & 1 deletion Auth/LearningHub.Nhs.Auth/Controllers/AccountController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ public async Task<IActionResult> Logout(LogoutInputModel model)
{
UserId = userId,
UserHistoryTypeId = (int)UserHistoryType.Logout,
Detail = @"User logged out",
Detail = @"User logged out" + this.webSettings.IsPasswordUpdate + " " + vm.TriggerExternalSignout,
};

await this.UserService.StoreUserHistoryAsync(userHistory);
Expand Down
10 changes: 5 additions & 5 deletions Auth/LearningHub.Nhs.Auth/Controllers/HomeController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -83,18 +83,18 @@ public async Task<IActionResult> Error()
/// <summary>
/// IsPasswordUpdateMethod.
/// </summary>
/// <param name="isLogout">The Logout.</param>
/// <param name="isPasswordUpdate">The PasswordUpdate.</param>
/// <returns>The <see cref="ActionResult"/>.</returns>
[HttpGet]
public IActionResult SetIsPasswordUpdate(bool isLogout)
public IActionResult SetIsPasswordUpdate(bool isPasswordUpdate)
{
if (isLogout)
if (isPasswordUpdate)
{
this.webSettings.IsPasswordUpdate = false;
this.webSettings.IsPasswordUpdate = true;
}
else
{
this.webSettings.IsPasswordUpdate = true;
this.webSettings.IsPasswordUpdate = false;
}

var redirectUri = $"{this.webSettings.LearningHubWebClient}Home/UserLogout";
Expand Down
160 changes: 2 additions & 158 deletions Auth/LearningHub.Nhs.Auth/Styles/nhsuk/common.scss
Original file line number Diff line number Diff line change
@@ -1,80 +1,4 @@
@use "../abstracts/all" as *;
@use "nhsuk" as *;

.nhsuk-u-font-style-italic {
font-style: italic;
}

.nhsuk-button--red {
background-color: $nhsuk-red !important;

&:hover {
background-color: $nhsuk-red-hover !important;
border-color: $nhsuk-red-hover !important;
}
}

.nhsuk-button--beta-login {
background-color: $nhsuk-blue;
box-shadow: 0 4px 0 #002f5c;
}

.nhsuk-button--beta-login:hover {
background-color: $nhsuk-btn-blue-hover;
}

// By default, the text on reverse (white) buttons turns white once clicked, rendering them invisible.
.nhsuk-button--reverse:visited {
color: $nhsuk-black
}

.nhsuk-back-link {
padding: px2rem(20) 0;
margin-bottom: 0;
}

.nhsuk-radios__divider {
text-align: left;
width: unset;
}

.nhsuk-radios__item label {
font-family: $font-stack;
}

/* Conditional radio buttons - Note: The nhsuk-radios__conditional element needs to be a SIBLING of the radio button input element
otherwise the CSS selector won't work. See Views/Bookmark/Move.cshtml for a usage example.
The NHSUK component (nhsuk-radios__conditional) requires JavaScript to work. These tweaks allow it to work without.
*/
.nhsuk-radios__conditional {
display: none;
margin-left: -22px;
margin-top: 8px;
}

.nhsuk-radios__input:checked ~ .nhsuk-radios__conditional {
display: block !important;
}

/* jquery unbobtrusive validation style over */
.nhsuk-error-summary__list li {
color: $nhsuk-red;
}

.nhsuk-form-group.input-validation-error {
@extend .nhsuk-form-group--error;
}

.nhsuk-input.input-validation-error {
@extend .nhsuk-input--error
}

.nhsuk-input:focus {
border: 2px solid #212b32;
box-shadow: inset 0 0 0 2px;
outline: 4px solid #ffeb3b; /* 1 */
outline-offset: 0;
}

.display--hide {
display: none !important;
Expand Down Expand Up @@ -119,81 +43,6 @@
display: block !important;
}


.nhsuk-bg-light-blue {
background-color: $nhsuk-light-blue-color;
}

.nhsuk-bg-pale-blue {
background-color: $nhsuk-pale-blue-color;
}

.nhsuk-bg-white {
background-color: $color_nhsuk-white;
}

.nhsuk-width-container.search-width-container {
max-width: px2rem(752);
margin: 0 auto;
padding-left: px2rem(68);
padding-right: px2rem(68);
}

/* One third column layout that switches to full width at the small desktop breakpoint (990px) instead of mobile. */
.nhsuk-grid-column-one-third-small-desktop {
@extend .nhsuk-grid-column-one-third;
width: 33.3333333333% !important;

@media (max-width: px2rem(990)) {
width: 100% !important;
}
}


/* Tweaks to styling for single card view. */
@media(min-width: 768px) and (max-width: 990px) {
.nhsuk-card-group .nhsuk-grid-column-one-third-small-desktop {
max-width: 600px !important;
}

.nhsuk-card-group--centred {
justify-content: center !important;
}
}

.nhsuk-card-banner-container {
padding-bottom: 42.86%;
position: relative;
}

.nhsuk-card-banner {
height: 100%;
object-fit: cover;
object-position: left;
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
}

.nhsuk-card-banner-empty {
background-color: $nhsuk-pale-blue-color;
border-bottom: 1px solid #d8dde0;
}

.nhsuk-error-message.error-message--margin-bottom-1 {
margin-bottom: nhsuk-spacing(1);
}

.nhsuk-u-margin-bottom-2point5 {
margin-bottom: 12px;

@media(max-width: 641px) {
margin-bottom: 10px;
}
}

.word-break__break-word {
word-break: break-word;
}
Expand All @@ -203,12 +52,6 @@
justify-content: space-between;
}

.nhsuk-button--no-shrink {
white-space: nowrap;
margin-top: auto !important;
margin-bottom: auto !important;
}

.modal-footer--buttons {
justify-content: space-between !important;
padding-left: 16px !important;
Expand All @@ -217,10 +60,11 @@
margin-top: auto !important;
margin-bottom: auto !important;
}

.validation-summary-valid {
display: none;
}

.field-validation-valid {
display: none !important;
}
}
Loading
Loading