diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f1167f4..8529439 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -24,12 +24,12 @@ jobs:
name: Build BCDC-SMK container image
# The type of runner that the job will run on
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-latest
outputs:
dockerversiontag: ${{ steps.calculateImageTag.outputs.DOCKER_VERSION_TAG }}
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
id: checkout
with:
# Disabling shallow clone is recommended for improving relevancy of reporting
@@ -62,7 +62,7 @@ jobs:
# --------- CACHE THE IMAGE TAG and ISSUE URL IN AN ARTIFACT
- name: upload image tag
id: uploadimagetag
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v4
with:
name: imagetag
path: |
@@ -74,7 +74,7 @@ jobs:
- name: Create the docker image
uses: docker/build-push-action@v1
with:
- registry: docker.pkg.github.com
+ registry: ghcr.io
username: $GITHUB_ACTOR
password: ${{ secrets.GITHUB_TOKEN }}
repository: bcgov/bcdc-smk/bcdc-smk
diff --git a/.github/workflows/devdeploy.yaml b/.github/workflows/devdeploy.yaml
index 0b4cf7b..70b4bee 100644
--- a/.github/workflows/devdeploy.yaml
+++ b/.github/workflows/devdeploy.yaml
@@ -13,7 +13,7 @@ jobs:
defaults:
run:
shell: bash
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-latest
outputs:
dockerversiontag: ${{ steps.retrieveimagetag.outputs.DOCKER_VERSION_TAG }}
issue_url: ${{ steps.retrieveimagetag.outputs.ISSUE_URL }}
@@ -22,7 +22,7 @@ jobs:
steps:
# Checking out code to get access to the openshift deploy template later on
# could also reference the github url?
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
id: checkout
with:
fetch-depth: 0
diff --git a/.github/workflows/prddeploy.yaml b/.github/workflows/prddeploy.yaml
index ed0e6ac..3705ddf 100644
--- a/.github/workflows/prddeploy.yaml
+++ b/.github/workflows/prddeploy.yaml
@@ -27,14 +27,14 @@ jobs:
defaults:
run:
shell: bash
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-latest
outputs:
dockerversiontag: ${{ steps.retrieveimagetag.outputs.DOCKER_VERSION_TAG }}
steps:
# CHECKOUT THE CODE
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
id: checkout
with:
fetch-depth: 0
diff --git a/.gitignore b/.gitignore
index 63ed39e..e3fa9d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -105,6 +105,9 @@ dist
# TernJS port file
.tern-port
+# IDE files
+.vscode
+
openshift/junk.js
openshift/jenkins_etltools_deployconfig.yaml
openshift/jenkins_bcdctools_deployconfig.yaml
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index bf9b132..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "lineEndings.lfCharacter": "¬",
- "editor.renderWhitespace": true,
- "editor.renderControlCharacters": true,
- "editor.renderIndentGuides": true,
- "python.pythonPath": "/usr/bin/python3",
- "python.linting.pylintEnabled": true,
- "python.linting.enabled": true,
- "cSpell.words": [
- "nargs"
- ]
-}
\ No newline at end of file
diff --git a/assets/BCSans-Regular.woff b/assets/BCSans-Regular.woff
new file mode 100644
index 0000000..07f8f0b
Binary files /dev/null and b/assets/BCSans-Regular.woff differ
diff --git a/assets/style.css b/assets/style.css
index 5d7663c..d5d1e78 100644
--- a/assets/style.css
+++ b/assets/style.css
@@ -1,3 +1,8 @@
+@font-face {
+ font-family: 'BC Sans';
+ src: url('BCSans-Regular.woff') format('woff');
+}
+
body {
position: absolute;
top: 0;
@@ -12,7 +17,11 @@ body {
justify-content: stretch;
align-items: stretch;
- font-family: Helvetica,Arial,sans-serif;
+ font-family: 'BC Sans',Helvetica,Arial,sans-serif;
+}
+
+button, input {
+ font-family: inherit;
}
header {
diff --git a/index.html b/index.html
index 3c1e7f5..0e49449 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
-
+
diff --git a/openshift/deployTemplate.yaml b/openshift/deployTemplate.yaml
index ff9f4fc..06e5d27 100644
--- a/openshift/deployTemplate.yaml
+++ b/openshift/deployTemplate.yaml
@@ -13,7 +13,7 @@ parameters:
value: dev
- name: "CONTAINER_SRC"
description: "path to the container/image stream"
- value: docker.pkg.github.com/bcgov/bcdc-smk/bcdc-smk
+ value: ghcr.io/bcgov/bcdc-smk/bcdc-smk
- name: "CONTAINER_SRC_SECRET_NAME"
description: "name of the secret that is used to retrieve the container, require by github hosted packages (images)"
value: bcdcsmk-image-secret
diff --git a/openshift/flow.md b/openshift/flow.md
index fee99d2..792e61f 100644
--- a/openshift/flow.md
+++ b/openshift/flow.md
@@ -26,7 +26,7 @@ repository: https://github.com/bcgov/bcdc-smk
* type: Image Secret
* secret name: bcdcsmk-image-secret
* Authentication: Image Registry Credentials
-* Image Registry Server Address: docker.pkg.github.com/bcgov/bcdc-smk/bcdc-smk
+* Image Registry Server Address: ghcr.io/bcgov/bcdc-smk/bcdc-smk
#### Create a service account
diff --git a/package.json b/package.json
index ee66c21..a32b520 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
"author": "Kevin Netherton",
"dependencies": {
"http-server": "^0.12.3",
- "smk": "1.0.0-beta.3"
+ "@bcgov/smk": "1.2.3"
},
"scripts": {
"browse": "http-server -o -c-1 -p 8080"
diff --git a/smk-config.json b/smk-config.json
index 4b1cca7..0e06179 100644
--- a/smk-config.json
+++ b/smk-config.json
@@ -15,10 +15,11 @@
],
"zoom": 6.676380220353304
},
- "baseMap": "Streets"
+ "esriApiKey": "AAPTxy8BH1VEsoebNVZXo8HurGGT_aCYgwCokRuPIAG5xSNuKTy4YvprSz_8gsh-llA428WQLbub59AvL7Vqq0WxOMBde6XTOmB0jkCxW4n59DLiYkN4tPwEaTnCtos8sUlWGZQSjl3lPZ0XM61ZkYR3M3QY8du3_BH3IZhyIg63PgYU4dgbXSYQOryTwd8izSWgEXS-8CCbPsNR6jLnoFipFDDa-w1R3FHGZifjDuJ83oM.AT1_qYsJlLTy",
+ "baseMap": "bcgov"
},
"layers": [],
- "version": "0.9.0-beta.3",
+ "version": "1.0.1",
"createdBy": "Kevin Netherton",
"createdDate": "2020-08-10T18:46:29.944Z",
"tools": [