Skip to content

Commit

Permalink
Merge upstream main (#5)
Browse files Browse the repository at this point in the history
* Create README.md

* Add FGP metadata template

* migrating changes from personal repo

* updating README to updated repo URL

* Added translations for province names

* Compressed files

* created french navigation, pages and download elements, migrated css to scss, seperated logic and removed some deprecated packages

* MapboxGL loaded on economic regions template page

* cleaning up pages folder for deployment

* Revert "Gatsby data"

* Added metadata

* Added metadata

* Removed seismic and multi hazard risk datasets

* Added license and draft statements

* Fix incorrect URL to wet-boew.min.js

This was broken by me in my earlier fix to #29 in commit 675c312

https://wet-boew.github.io/themes-dist/GCWeb/wet-boew/js/wet-boew.min.js
remained in its original URL, i.e. did not get moved one directory level
down unlike the other assets.

Thanks to @jvanulde for the heads up!

* Updated metadata

* Formatting changes

* Separated data resource tables for national and regional scale downloads

* Removed superfluous data

* Added data dictionary for physical exposure and social vulnerability

* Testing download

* Remapping download links

* Adding LFS path

* Update _config.yml

* Replace relative URL to absolute for LFS files

* Removing Risk Dynamics layer

* Adding map view

* Update nhsl_map.md

Fixed broken breadcrumb

* Updated licence style and location

* Optimized layout for mobile

* Added breadcrumb to map view

* Fixed broken links

* Updated modified date

* Added region filter

* Update nhsl.md

* Added WET-BOEW Geomap

Waiting on finalization of FGP services before adding layers.

* Updated breadcrumbs

* Fixed bug in YT data filter

* Update _config.yml

* Delete nhsl_physical_exposure_all_indicators_b_ns.zip

* Fixed top of page link

* Compressed files (#39)

* Added translations for province names

* Compressed files

* Added metadata

* Added metadata

* Updated metadata

* Formatting changes

* Separated data resource tables for national and regional scale downloads

* Removed superfluous data

* Added data dictionary for physical exposure and social vulnerability

* Testing download

* Remapping download links

* Adding LFS path

* Update _config.yml

* Replace relative URL to absolute for LFS files

* Removing Risk Dynamics layer

* Adding map view

* Update nhsl_map.md

Fixed broken breadcrumb

* Updated licence style and location

* Optimized layout for mobile

* Added breadcrumb to map view

* Fixed broken links

* Updated modified date

* Added region filter

* Update nhsl.md

* Added WET-BOEW Geomap

Waiting on finalization of FGP services before adding layers.

* Updated breadcrumbs

* Fixed bug in YT data filter

* Update _config.yml

* Delete nhsl_physical_exposure_all_indicators_b_ns.zip

* Fixed top of page link

* Update _config.yml

Co-authored-by: Michael <[email protected]>
Co-authored-by: Anthony Fok <[email protected]>
  • Loading branch information
3 people authored May 11, 2021
1 parent 6ff0c46 commit 900c95f
Show file tree
Hide file tree
Showing 770 changed files with 3,540 additions and 2,966 deletions.
3 changes: 1 addition & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
*.geojson filter=lfs diff=lfs merge=lfs -text
*.gpkg filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
1 change: 0 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ PLATFORMS

DEPENDENCIES
jekyll (~> 4.0.0)
jekyll-feed (~> 0.12)
minima (~> 2.5)
tzinfo (~> 1.2)
tzinfo-data
Expand Down
8 changes: 4 additions & 4 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ compress_html:
blanklines: true
profile: false
quiet: false
timezone: America/Toronto # Timezone for blog posts and alike
timezone: America/Vancouver # Timezone for blog posts and alike
themeJS: true
verbose: false

Expand Down Expand Up @@ -69,7 +69,7 @@ analytics_google: ""
analytics_google_anonymize_ip: ""
assets: "https://wet-boew.github.io/themes-dist/GCWeb"
baseurl: "/data" # set this to your GitHub project name
lfs_data_url: "https://www.github.com/OpenDRR/data/raw/main"
lfspath: "https://www.github.com/OpenDRR/data/raw/main" # set this if you're using git-lfs as: https://www.github.com/jvanulde/data//raw/<git repo name>
css_inline: false # Will insert all styles into a single <style> block in the <head> element and remove the style <link> reference
description:
en: "OpenDRR Downloads" # English site description and default description
Expand Down Expand Up @@ -276,12 +276,12 @@ defaults:
noMainContainer: false
noContentTitle: false
share: true
sitemenu: true
sitemenu: false
sitesearch: true
stylesheets:

encoding: utf-8 # Make sure the encoding is right
email: ""
email: "[email protected]"
repo: "https://github.com/wet-boew/gcweb-jekyll"
# service_worker: false # Will turn off the service worker if set to false
stylesheets:
Expand Down
892 changes: 892 additions & 0 deletions _data/metadata.json

Large diffs are not rendered by default.

66 changes: 66 additions & 0 deletions _data/prov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
provinces:
- id: 'ab'
code: '48'
title:
en: 'Alberta'
fr: 'Alberta'
- id: 'bc'
code: '59'
title:
en: 'British Columbia'
fr: 'Colombie Britannique'
- id: 'nl'
code: '10'
title:
en: 'Newfoundland and Labrador'
fr: 'Terre Neuve et Labrador'
- id: 'pe'
code: '11'
title:
en: 'Prince Edward Island'
fr: 'Île du Prince Édouard'
- id: 'ns'
code: '12'
title:
en: 'Nova Scotia'
fr: 'Nouvelle-Écosse'
- id: 'nb'
code: '13'
title:
en: 'New Brunswick'
fr: 'Nouveau Brunswick'
- id : 'qc'
code: '24'
title:
en: 'Quebec'
fr: 'Quebec'
- id: 'on'
code: '35'
title:
en: 'Ontario'
fr: 'Ontario'
- id: 'mb'
code: '46'
title:
en: 'Manitoba'
fr: 'Manitoba'
- id: 'sk'
code: '47'
title:
en: 'Saskatchewan'
fr: 'Saskatchewan'
- id: 'yk'
code: '60'
title:
en: 'Yukon'
fr: 'Yukon'
- id: 'nt'
code: '61'
title:
en: 'Northwest Territories'
fr: 'Territoires du Nord-Ouest'
- id: 'nu'
code: '62'
title:
en: 'Nunavut'
fr: 'Nunavut'
8 changes: 5 additions & 3 deletions _includes/breadcrumbs.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
<nav id="wb-bc" property="breadcrumb">
<h2>{{ page.i18n.you-are-here[page.lang] }}:</h2>
<div class="container">
<ol class="breadcrumb">
{% include breadcrumbscontent.html %}
</ol>
<div class="row">
<ol class="breadcrumb">
{% include breadcrumbscontent.html %}
</ol>
</div>
</div>
</nav>
2 changes: 1 addition & 1 deletion _includes/footerresources.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
<script src="{{ site.assets }}/{{ site.theme-name }}/wet-boew/js/wet-boew.min.js"></script>
<script src="{{ site.assets }}/wet-boew/js/wet-boew.min.js"></script>
<!-- {% if page.leaflet == true %}
<script src="https://unpkg.com/{{ site.leaflet }}/dist/leaflet.js"></script>
{% endif %} -->
Expand Down
Loading

0 comments on commit 900c95f

Please sign in to comment.