Merge pull request #77 from bcgov/smk-update

SMK Update

.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

.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

.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

.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

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 {

index.html

@@ -4,7 +4,7 @@
         <title></title>
         <!-- SMK BOOTSTRAP - - - - - - - -->
         <link rel="stylesheet" type="text/css" href="./assets/style.css"/>
-        <script src="./node_modules/smk/dist/smk.js"></script>
+        <script src="./node_modules/@bcgov/smk/dist/smk.js"></script>
         <!-- - - - - - - - - - - - - - - -->
     </head>
 

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

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 

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"

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": [