Skip to content

Commit 40bcb7f

Browse files
authored
Merge pull request #45 from TechnologyEnhancedLearning/feat-add-tel-frontend-package
Feat add tel frontend package
2 parents 170b140 + 0d13504 commit 40bcb7f

File tree

22 files changed

+12091
-18
lines changed

22 files changed

+12091
-18
lines changed

.github/workflows/dev.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,17 @@ jobs:
212212
- name: Clean lock files because the newly generated package file will superseed the locks
213213
run: |
214214
find . -name "packages.lock.json" -type f -exec rm -f {} \;
215-
215+
216+
- name: Set up Node.js so we have gulp for retrieving TEL Frontend Css
217+
uses: actions/setup-node@v4
218+
with:
219+
node-version: '20'
220+
221+
- name: Install npm packages so we have gulp for retrieving TEL Frontend Css
222+
working-directory: ./Package.BlazorComponentLibrary
223+
run: npm ci
224+
#CI is an install with adhering to package-lock
225+
216226
- name: Build BlazorComponentLibrary (it publishes on build)
217227
run: |
218228
dotnet build Package.BlazorComponentLibrary -c Release \

.github/workflows/release.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,16 @@ jobs:
119119
- name: Restore NuGet Packages for Specifically the BCL Package Library Project
120120
run: dotnet restore Package.BlazorComponentLibrary/Package.BlazorComponentLibrary.csproj
121121

122-
122+
- name: Set up Node.js so we have gulp for retrieving TEL Frontend Css
123+
uses: actions/setup-node@v4
124+
with:
125+
node-version: '20'
126+
127+
- name: Install npm packages so we have gulp for retrieving TEL Frontend Css
128+
working-directory: ./Package.BlazorComponentLibrary
129+
run: npm ci
130+
#CI is an install with adhering to package-lock
131+
123132
- name: Build and Pack BlazorComponentLibrary
124133
run: |
125134
dotnet build Package.BlazorComponentLibrary -c Release \

CHANGELOG.md

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,45 @@
1+
# [9.2.0-feat-add-tel-frontend-package.6](https://github.com/TechnologyEnhancedLearning/GitPageBlazorWASM/compare/v9.2.0-feat-add-tel-frontend-package.5...v9.2.0-feat-add-tel-frontend-package.6) (2025-04-22)
2+
3+
4+
### Bug Fixes
5+
6+
* **go to release:** css pipeline ([06d3df6](https://github.com/TechnologyEnhancedLearning/GitPageBlazorWASM/commit/06d3df62a326d17c2c17483ce7412ae95c313816))
7+
8+
# [9.2.0-feat-add-tel-frontend-package.5](https://github.com/TechnologyEnhancedLearning/GitPageBlazorWASM/compare/v9.2.0-feat-add-tel-frontend-package.4...v9.2.0-feat-add-tel-frontend-package.5) (2025-04-22)
9+
10+
11+
### Bug Fixes
12+
13+
* **pipe:** npm ([cf9780a](https://github.com/TechnologyEnhancedLearning/GitPageBlazorWASM/commit/cf9780ac5eb6d3b2ddb4d26e4358f795abf0f6a4))
14+
15+
# [9.2.0-feat-add-tel-frontend-package.4](https://github.com/TechnologyEnhancedLearning/GitPageBlazorWASM/compare/v9.2.0-feat-add-tel-frontend-package.3...v9.2.0-feat-add-tel-frontend-package.4) (2025-04-22)
16+
17+
18+
### Bug Fixes
19+
20+
* **try npm in ci:** ci for npm ([74e6df9](https://github.com/TechnologyEnhancedLearning/GitPageBlazorWASM/commit/74e6df9f94caaf09ff800ab47546c5674dbcbd5d))
21+
22+
# [9.2.0-feat-add-tel-frontend-package.3](https://github.com/TechnologyEnhancedLearning/GitPageBlazorWASM/compare/v9.2.0-feat-add-tel-frontend-package.2...v9.2.0-feat-add-tel-frontend-package.3) (2025-04-22)
23+
24+
25+
### Bug Fixes
26+
27+
* **is it read:** is it red ([660b5ab](https://github.com/TechnologyEnhancedLearning/GitPageBlazorWASM/commit/660b5ab5156c14941dba4f5252bb6997a0303c3a))
28+
29+
# [9.2.0-feat-add-tel-frontend-package.2](https://github.com/TechnologyEnhancedLearning/GitPageBlazorWASM/compare/v9.2.0-feat-add-tel-frontend-package.1...v9.2.0-feat-add-tel-frontend-package.2) (2025-04-17)
30+
31+
32+
### Features
33+
34+
* **builds:** we have the nhsuk.css ([4963859](https://github.com/TechnologyEnhancedLearning/GitPageBlazorWASM/commit/4963859baecfb394e806247e9c7815f8468deda8))
35+
36+
# [9.2.0-feat-add-tel-frontend-package.1](https://github.com/TechnologyEnhancedLearning/GitPageBlazorWASM/compare/v9.1.6...v9.2.0-feat-add-tel-frontend-package.1) (2025-04-17)
37+
38+
39+
### Features
40+
41+
* **shouldnt just push:** but incase common desktop ([9039c17](https://github.com/TechnologyEnhancedLearning/GitPageBlazorWASM/commit/9039c1787af8e8d6f4cdee75f84610faf9cb389f))
42+
143
## [9.1.6](https://github.com/TechnologyEnhancedLearning/GitPageBlazorWASM/compare/v9.1.5...v9.1.6) (2025-04-15)
244

345

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
namespace Package.BlazorComponentLibrary.BCLVersion { public static class VersionInfo { public static string Version = "10.9.7" ;
1+
namespace Package.BlazorComponentLibrary.BCLVersion { public static class VersionInfo { public static string Version = "10.9.8" ;
22
} }

Package.BlazorComponentLibrary/Components/SimpleCounter.razor

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<h3>Simple Counter</h3>
2+
<h1 class="nhsuk-tag--red">!!!!!! If im red we are getting nhsuk-tag-red !!!!!!</h1>
3+
<h1 class="scoped-css-simple-counter-red">if im red we have scoped css (though for our scenario we probably will solely rely on nhsuk)</h1>
24
change
35
<b>version from build process</b>
46
<span class="version-display">@Package.BlazorComponentLibrary.BCLVersion.VersionInfo.Version</span>

Package.BlazorComponentLibrary/Components/SimpleCounter.razor.css

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
color: blue;
33
font-size: 24px;
44
}
5-
5+
.scoped-css-simple-counter-red {
6+
color: red;
7+
}
68
button {
79
background-color: lightblue;
810
color: white;

Package.BlazorComponentLibrary/Package.BlazorComponentLibrary.csproj

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,23 @@
4646
<Content Remove="..\CICDPackageLocation\**\*" />
4747
<None Remove="..\CICDPackageLocation\**\*" />
4848
</ItemGroup>
49+
<ItemGroup>
50+
<Folder Include="Assets\" />
51+
<Folder Include="wwwroot\css\" />
52+
<Folder Include="wwwroot\js\" />
53+
</ItemGroup>
54+
<ItemGroup>
55+
<Content Update="wwwroot\**\*.*">
56+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
57+
</Content>
58+
</ItemGroup>
4959
<Target Name="WriteBclVersionToFile" BeforeTargets="PrepareForBuild">
5060
<WriteLinesToFile File="wwwroot/bclversion.txt" Lines="$(BCLVersion)" Overwrite="true" Encoding="UTF-8" />
5161
<WriteLinesToFile File="BCLVersion/VersionInfo.cs" Lines="namespace Package.BlazorComponentLibrary.BCLVersion { public static class VersionInfo { public static string Version = &quot;$(BCLVersion)&quot; %3B; } }" Overwrite="true" Encoding="UTF-8" />
5262
</Target>
5363

64+
<Target Name="RunGulp" BeforeTargets="Build">
65+
<Exec Command="npx gulp" WorkingDirectory="$(ProjectDir)"/>
66+
</Target>
67+
5468
</Project>
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
// gulpfile.js
2+
3+
const gulp = require("gulp");
4+
const sass = require("gulp-sass")(require("sass"));
5+
const concat = require("gulp-concat");
6+
7+
// Compile SCSS to CSS
8+
gulp.task("sass", function () {
9+
return gulp
10+
.src("./scss/**/*.scss") // Adjust this path if needed
11+
.pipe(sass().on("error", sass.logError))
12+
.pipe(concat("site.css"))
13+
.pipe(gulp.dest("wwwroot/css"));
14+
});
15+
16+
// Copy Bootstrap CSS from node_modules
17+
// .src("node_modules/bootstrap/dist/css/bootstrap.min.css")
18+
//.src("node_modules/nhsuk-frontend/dist/nhsuk-9.0.1.min.css") //if providing the css too
19+
gulp.task("copy-nhsuk-css", function () {
20+
return gulp
21+
.src("node_modules/nhse-tel-frontend/dist/nhsuk.css")
22+
.pipe(gulp.dest("wwwroot/css"));
23+
});
24+
25+
// Watch for changes
26+
gulp.task("watch", function () {
27+
gulp.watch("./scss/**/*.scss", gulp.series("sass"));
28+
});
29+
//,"watch"
30+
// Default task
31+
gulp.task("default", gulp.series("copy-nhsuk-css", "sass"));

0 commit comments

Comments
 (0)