Skip to content

Update data models and dataset site template #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update data models and dataset site template #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 19 additions & 19 deletions OpenActive.DatasetSite.NET.Generator/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions OpenActive.DatasetSite.NET.Generator/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"author": "Nick Evans",
"license": "MIT",
"dependencies": {
"@openactive/data-models": "^2.0.290",
"@openactive/dataset-site-template": "^7.0.0",
"@openactive/data-models": "^3.0.9",
"@openactive/dataset-site-template": "^8.0.0",
"fs-extra": "^7.0.1",
"sync-request": "^6.0.0"
}
Expand Down
2 changes: 1 addition & 1 deletion OpenActive.DatasetSite.NET/OpenActive.DatasetSite.NET.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

<ItemGroup>
<None Include="..\README.md" Pack="true" PackagePath="\" />
<PackageReference Include="OpenActive.NET" Version="15.2.21" />
<PackageReference Include="OpenActive.NET" Version="15.2.25" />
<PackageReference Include="Stubble.Core" Version="1.9.3" />
<PackageReference Include="Stubble.Extensions.JsonNet" Version="1.2.3" />
</ItemGroup>
Expand Down
18 changes: 9 additions & 9 deletions OpenActive.DatasetSite.NET/metadata/DatasetSiteMustacheTemplate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ public static class DatasetSiteMustacheTemplate
public const string SingleTemplateFileContent = @"
<!DOCTYPE HTML>
<!--
OpenActive Dataset Site Template version 7, from https://unpkg.com/@openactive/dataset-site-template@7.0.0/dist/datasetsite.mustache
OpenActive Dataset Site Template version 8, from https://unpkg.com/@openactive/dataset-site-template@8.0.0/dist/datasetsite.mustache
-->
<!--
Design: Identity by HTML5 UP
Expand Down Expand Up @@ -1360,11 +1360,11 @@ @media screen and (max-width: 360px) {
public const string CspCompatibleTemplateFileContent = @"
<!DOCTYPE HTML>
<!--
OpenActive Dataset Site Template version 7, from https://unpkg.com/@openactive/dataset-site-template@7.0.0/dist/datasetsite-csp.mustache
OpenActive Dataset Site Template version 8, from https://unpkg.com/@openactive/dataset-site-template@8.0.0/dist/datasetsite-csp.mustache

This HTML file must reference a self-hosted 'datasetsite.styles.v7.css' file, co-located with the rest
This HTML file must reference a self-hosted 'datasetsite.styles.v8.css' file, co-located with the rest
of the static assets from the following archive:
https://unpkg.com/@openactive/dataset-site-template@7.0.0/dist/datasetsite-csp.static.zip
https://unpkg.com/@openactive/dataset-site-template@8.0.0/dist/datasetsite-csp.static.zip
-->
<!--
Design: Identity by HTML5 UP
Expand Down Expand Up @@ -1407,21 +1407,21 @@ For openactive.io
</script>

<!--
This stylesheet href must reference a self-hosted 'datasetsite.styles.v7.css' file in
This stylesheet href must reference a self-hosted 'datasetsite.styles.v8.css' file in
the same directory as the other static assets sourced from the following archive:
https://unpkg.com/@openactive/dataset-site-template@7.0.0/dist/datasetsite-csp.static.zip
https://unpkg.com/@openactive/dataset-site-template@8.0.0/dist/datasetsite-csp.static.zip
-->
<link rel=""stylesheet"" href=""{{{staticAssetsPathUrl}}}/datasetsite.styles.v7.css"" crossorigin=""anonymous"">
<link rel=""stylesheet"" href=""{{{staticAssetsPathUrl}}}/datasetsite.styles.v8.css"" crossorigin=""anonymous"">

</head>
<body id=""booking"" background=""{{backgroundImage.url}}"">
<table class=""always-hidden"" bgcolor=""#FFFFFF"" width=""100%"" height=""500px""><tr><td align=""center"">
<p></p>
<p><large><strong>Error: Static Assets Not Found</strong><large></p>
<p>This HTML page must reference self-hosted static assets located at the relative or absolute path configured by ""staticAssetsPathUrl"" in the mustache template source data.</p>
<p>""staticAssetsPathUrl"" is currently set to ""{{staticAssetsPathUrl}}"", and this page has failed to access this file: <pre>{{staticAssetsPathUrl}}/datasetsite.styles.v7.css</pre></p>
<p>""staticAssetsPathUrl"" is currently set to ""{{staticAssetsPathUrl}}"", and this page has failed to access this file: <pre>{{staticAssetsPathUrl}}/datasetsite.styles.v8.css</pre></p>
<p>Please ensure that the assets at this location exactly match those in
<a href=""https://unpkg.com/@openactive/dataset-site-template@7.0.0/dist/datasetsite-csp.static.zip"">datasetsite-csp.static.zip version 7</a>.</p>
<a href=""https://unpkg.com/@openactive/dataset-site-template@8.0.0/dist/datasetsite-csp.static.zip"">datasetsite-csp.static.zip version 8</a>.</p>
<p></p>
<p>See the <a href=""https://github.com/openactive/dataset-site-template"">""CSP compatible template"" documentation</a> for more information</p>
<p></p>
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Simply call one of the Render methods detailed below to output self-contained HT

Returns a string corresponding to the compiled HTML, based on an embedded version of `datasetsite.mustache`, the provided `settings`, and `supportedOpportunityTypes`.

If `staticAssetsPathUrl` is provided, the [CSP-compatible template](https://developer.openactive.io/publishing-data/dataset-sites#template-hosting-options) is rendered. In this case you must ensure that you are serving the contents of [CSP compatible static assets archive v7](https://unpkg.com/@openactive/dataset-site-template@7.0.0/dist/datasetsite-csp.static.zip) at this location.
If `staticAssetsPathUrl` is provided, the [CSP-compatible template](https://developer.openactive.io/publishing-data/dataset-sites#template-hosting-options) is rendered. In this case you must ensure that you are serving the contents of [CSP compatible static assets archive v8](https://unpkg.com/@openactive/dataset-site-template@8.0.0/dist/datasetsite-csp.static.zip) at this location.

`supportedOpportunityTypes` must be a `List<OpportunityType>`, which auto-generates the metadata associated which each feed using best-practice values.

Expand Down Expand Up @@ -133,7 +133,7 @@ var dataFeedDescriptions = new List<string> {
};
```

If `staticAssetsPathUrl` is provided, the [CSP-compatible template](https://developer.openactive.io/publishing-data/dataset-sites#template-hosting-options) is rendered. In this case you must ensure that you are serving the contents of [CSP compatible static assets archive v7](https://unpkg.com/@openactive/dataset-site-template@7.0.0/dist/datasetsite-csp.static.zip) at this location.
If `staticAssetsPathUrl` is provided, the [CSP-compatible template](https://developer.openactive.io/publishing-data/dataset-sites#template-hosting-options) is rendered. In this case you must ensure that you are serving the contents of [CSP compatible static assets archive v8](https://unpkg.com/@openactive/dataset-site-template@8.0.0/dist/datasetsite-csp.static.zip) at this location.


#### Example
Expand Down Expand Up @@ -227,7 +227,7 @@ Returns a string corresponding to the compiled HTML, based on an embedded versio

The `dataset` argument must be an object of type `OpenActive.NET.Dataset`, and must contain the properties required to render the dataset site.

If `staticAssetsPathUrl` is provided, the [CSP-compatible template](https://developer.openactive.io/publishing-data/dataset-sites#template-hosting-options) is rendered. In this case you must ensure that you are serving the contents of [CSP compatible static assets archive v7](https://unpkg.com/@openactive/dataset-site-template@7.0.0/dist/datasetsite-csp.static.zip) at this location.
If `staticAssetsPathUrl` is provided, the [CSP-compatible template](https://developer.openactive.io/publishing-data/dataset-sites#template-hosting-options) is rendered. In this case you must ensure that you are serving the contents of [CSP compatible static assets archive v8](https://unpkg.com/@openactive/dataset-site-template@8.0.0/dist/datasetsite-csp.static.zip) at this location.

#### Example

Expand Down
2 changes: 1 addition & 1 deletion version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
"version": "7.0",
"version": "8.0",
"publicReleaseRefSpec": [
"^refs/heads/master$"
],
Expand Down
Loading