Merge branch 'master' into GogoVega-patch-2

Author: GogoVega

.github/workflows/deploy-github.yml

@@ -13,13 +13,15 @@ jobs:
           node-version: '16'
 
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: npm ci
 
       - name: Check for linting errors
-        run: yarn test
+        run: npm run test
 
       - name: Build production website
-        run: yarn build
+        run: npm run build
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Deploy to GitHub Pages
         uses: peaceiris/actions-gh-pages@v3

.github/workflows/test.yml

@@ -12,20 +12,21 @@ jobs:
           node-version: "16"
 
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: npm ci
 
       - name: Check for linting errors
-        run: yarn lint
+        run: npm run lint
 
       - name: Build production website
-        run: yarn build
+        run: npm run build:preview
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Netlify Actions
         uses: nwtgck/[email protected]
         with:
           publish-dir: "./public"
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          netlify-config-path: ./netlify.toml
         env:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN_NRCHKB_WIKI }}
           NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID_NRCHKB_WIKI }}

.gitignore

@@ -7,3 +7,7 @@ bin
 .vscode
 
 *.iml
+
+
+data/nrchkb/contributors.json
+data/nrchkb/contributorsMap.json

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-yarn lint
+npm run lint

CHANGELOG.md

@@ -2,6 +2,28 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.51.0](https://github.com/NRCHKB/NRCHKB.github.io/compare/v1.50.3...v1.51.0) (2022-02-22)
+
+
+### Features
+
+* add relation between Camera* Services to Camera Control Service ([5ae7c84](https://github.com/NRCHKB/NRCHKB.github.io/commit/5ae7c8496e5e29de481e83b34cee51d6a830c5c8))
+* disable bottom alert ([49915b0](https://github.com/NRCHKB/NRCHKB.github.io/commit/49915b0e256eee609f8a4bd7af57cc1adbc16c84))
+* Faucet Service + Valve Service ([#103](https://github.com/NRCHKB/NRCHKB.github.io/issues/103)) ([2086fff](https://github.com/NRCHKB/NRCHKB.github.io/commit/2086fff8a5552bc4a5ff14c02acdc73ce8441c19))
+* Main page improvements ([7e00e9b](https://github.com/NRCHKB/NRCHKB.github.io/commit/7e00e9bd8fc9dc68ada7b8c20e3be90d4ba372d2))
+* make alert background on light theme more contrast ([ba6a07d](https://github.com/NRCHKB/NRCHKB.github.io/commit/ba6a07da9d118b1c84fde642b863b795ad91c95d))
+* Update HomePage, Introduction and Nodes + Alert Style ([#112](https://github.com/NRCHKB/NRCHKB.github.io/issues/112)) ([0f3d2c8](https://github.com/NRCHKB/NRCHKB.github.io/commit/0f3d2c82935e9c1db0e2be7ba5e7d94b22cb5ce3))
+
+
+### Bug Fixes
+
+* Custom config path for netlify ([#115](https://github.com/NRCHKB/NRCHKB.github.io/issues/115)) ([f99e451](https://github.com/NRCHKB/NRCHKB.github.io/commit/f99e451dc54fbba8754d823eaa517a6b24d89364))
+* netlify preview url ([622caa8](https://github.com/NRCHKB/NRCHKB.github.io/commit/622caa8c8b06bc02eb6b5f16f1ceb0773a263141))
+* netlify.toml lines nesting ([ad027fc](https://github.com/NRCHKB/NRCHKB.github.io/commit/ad027fcb80c0eff73e75d215071aede881e965e6))
+* Probably correct netlify preview config ([9cff781](https://github.com/NRCHKB/NRCHKB.github.io/commit/9cff7818b8dc6951d81bfff52701f87667fff433))
+* Resolve Problem with non-stationary sidebar ([c40a7b0](https://github.com/NRCHKB/NRCHKB.github.io/commit/c40a7b0deb90c7b6dcf4fea26b1bf8aa9fc7ef26))
+* Resolve Problem with Scrollbar (docs-menu) ([9dc652a](https://github.com/NRCHKB/NRCHKB.github.io/commit/9dc652a2ad37c1f57938d4b941c137e08ef5bc8c))
+
 ### [1.50.3](https://github.com/NRCHKB/NRCHKB.github.io/compare/v1.50.2...v1.50.3) (2022-01-06)
 
 

archetypes/blog.md

@@ -3,11 +3,9 @@ title: "{{ replace .Name "-" " " | title }}"
 description: ""
 lead: ""
 date: {{ .Date }}
-lastmod: {{ .Date }}
 draft: true
 weight: 50
 images: ["{{ .Name | urlize }}.jpg"]
-contributors: []
 ---
 
 {{< img src="{{ .Name | urlize }}.jpg" alt="{{ replace .Name "-" " " | title }}" caption="{{ replace .Name "-" " " | title }}" class="wide" >}}

archetypes/default.md

@@ -2,7 +2,6 @@
 title: "{{ replace .Name "-" " " | title }}"
 description: ""
 date: {{ .Date }}
-lastmod: {{ .Date }}
 draft: true
 images: []
 ---

archetypes/wiki.md

@@ -3,7 +3,6 @@ title: "{{ replace .Name "-" " " | title }}"
 description: ""
 lead: ""
 date: {{ .Date }}
-lastmod: {{ .Date }}
 draft: true
 images: []
 menu:
@@ -15,7 +14,6 @@ service:
   name: ""
 weight: 999
 toc: true
-contributors: []
 ---
 
 {{< img src="{{ .Name | urlize }}.jpg" alt="{{ replace .Name "-" " " | title }}" caption="{{ replace .Name "-" " " | title }}" >}}

assets/scss/common/_global.scss

@@ -107,7 +107,6 @@ body {
       position: -webkit-sticky;
       position: sticky;
       top: 4rem;
-      z-index: 1000;
       height: calc(100vh - 4rem);
     }
   }

assets/scss/components/_alerts.scss

@@ -29,7 +29,7 @@
 }
 
 .alert-warning {
-  background: $beige;
+  background: #1b1f221f;
   color: $black;
 }