Merge branch 'develop' of https://github.com/objectcomputing/check-ins into feature-2106/add-category-to-skills

pieperm · pieperm · commit 8f07613f932a · 2024-03-15T17:17:55.000-05:00
diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml
@@ -1,10 +1,15 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
 # Sample workflow for building and deploying a Jekyll site to GitHub Pages
-name: Deploy Jekyll with GitHub Pages dependencies preinstalled
+name: Deploy Jekyll site to Pages
 
 on:
   # Runs on pushes targeting the default branch
   push:
-    branches: ["develop"]
+    branches: [develop]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -28,15 +33,28 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0
+        with:
+          working-directory: docs
+          ruby-version: '3.3' # Not needed with a .ruby-version file
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+          cache-version: 0 # Increment this number if you need to re-download cached gems
       - name: Setup Pages
+        id: pages
         uses: actions/configure-pages@v4
       - name: Build with Jekyll
-        uses: actions/jekyll-build-pages@v1
-        with:
-          source: ./docs
-          destination: ./_site
+        # Outputs to the './_site' directory by default
+        run: |-
+          cd docs
+          bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
+        env:
+          JEKYLL_ENV: production
       - name: Upload artifact
+        # Automatically uploads an artifact from the './_site' directory by default
         uses: actions/upload-pages-artifact@v3
+        with:
+          path: docs/_site
 
   # Deployment job
   deploy:
@@ -48,4 +66,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v4
diff --git a/docs/Gemfile b/docs/Gemfile
@@ -1,3 +1,7 @@
 source "https://rubygems.org"
 
 gem "github-pages", group: :jekyll_plugins
+
+gem "csv"
+gem "webrick"
+gem "just-the-docs"
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
@@ -1,36 +1,43 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7.7)
+    activesupport (7.1.3.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     base64 (0.2.0)
+    bigdecimal (3.1.6)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
     colorator (1.1.0)
     commonmarker (0.23.10)
     concurrent-ruby (1.2.3)
-    dnsruby (1.70.0)
+    connection_pool (2.4.1)
+    csv (3.2.8)
+    dnsruby (1.71.0)
       simpleidn (~> 0.2.1)
+    drb (2.2.1)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
     eventmachine (1.2.7)
     execjs (2.9.1)
-    faraday (2.8.1)
-      base64
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.2)
+    faraday (2.9.0)
+      faraday-net_http (>= 2.0, < 3.2)
+    faraday-net_http (3.1.0)
+      net-http
     ffi (1.16.3)
     forwardable-extended (2.6.0)
     gemoji (4.1.0)
@@ -199,6 +206,11 @@ GEM
       gemoji (>= 3, < 5)
       html-pipeline (~> 2.2)
       jekyll (>= 3.0, < 5.0)
+    just-the-docs (0.8.1)
+      jekyll (>= 3.8.5)
+      jekyll-include-cache
+      jekyll-seo-tag (>= 2.0)
+      rake (>= 12.3.1)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
@@ -208,14 +220,25 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
-    mini_portile2 (2.8.5)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.22.2)
-    nokogiri (1.16.2)
-      mini_portile2 (~> 2.8.2)
+    minitest (5.22.3)
+    mutex_m (0.2.0)
+    net-http (0.4.1)
+      uri
+    nokogiri (1.16.2-aarch64-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.2-arm-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.2-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.2-x86-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.2-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.2-x86_64-linux)
       racc (~> 1.4)
     octokit (4.25.1)
       faraday (>= 1, < 3)
@@ -224,12 +247,12 @@ GEM
       forwardable-extended (~> 2.6)
     public_suffix (5.0.4)
     racc (1.7.3)
+    rake (13.1.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.6)
     rouge (3.30.0)
-    ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     safe_yaml (1.0.5)
     sass (3.7.4)
@@ -252,13 +275,22 @@ GEM
       unf_ext
     unf_ext (0.0.9.1)
     unicode-display_width (1.8.0)
-    zeitwerk (2.6.13)
+    uri (0.13.0)
+    webrick (1.8.1)
 
 PLATFORMS
-  ruby
+  aarch64-linux
+  arm-linux
+  arm64-darwin
+  x86-linux
+  x86_64-darwin
+  x86_64-linux
 
 DEPENDENCIES
+  csv
   github-pages
+  just-the-docs
+  webrick
 
 BUNDLED WITH
-   1.17.2
+   2.5.3
diff --git a/docs/_config.yml b/docs/_config.yml
@@ -1,7 +1,23 @@
 title: Check-Ins
 logo: /assets/img/logo.png
-description: Check-Ins is an open-source team engagement platform for organizations looking to create meaningful, long-term relationships with team members.
-show_downloads: true
-google_analytics:
-theme: jekyll-theme-minimal
+description: Check-Ins is an open-source team engagement platform designed to empower you and your colleagues to collaborate, grow, and thrive.
+theme: just-the-docs
+url: https://objectcomputing.github.io/check-ins
+repository: objectcomputing/check-ins # for github-metadata
 
+permalink: pretty
+
+exclude:
+  - Makefile
+  - Gemfile
+  - Gemfile.lock
+  - tmp/
+  - vendor/
+
+plugins:
+  - jemoji
+  - jekyll-avatar
+  - jekyll-mentions
+  - jekyll-seo-tag
+  - jekyll-github-metadata
+  - jekyll-include-cache
diff --git a/docs/_sass/custom/setup.scss b/docs/_sass/custom/setup.scss
@@ -0,0 +1 @@
+$header-height: 5rem;
diff --git a/docs/assets/img/logo.png b/docs/assets/img/logo.png
diff --git a/docs/getting-started/index.md b/docs/getting-started/index.md
@@ -0,0 +1,8 @@
+---
+title: Getting Started
+has_children: true
+---
+
+# Getting Started
+
+Test.
diff --git a/docs/getting-started/setup/index.md b/docs/getting-started/setup/index.md
@@ -0,0 +1,9 @@
+---
+title: Setup
+parent: Getting Started
+has_children: true
+---
+
+# Setting up your environment
+
+Test
diff --git a/docs/getting-started/setup/macos.md b/docs/getting-started/setup/macos.md
@@ -0,0 +1,9 @@
+---
+title: MacOS
+parent: Setup
+grand_parent: Getting Started
+---
+
+# What you'll need
+
+Test.
diff --git a/docs/index.md b/docs/index.md
diff --git a/server/src/main/java/com/objectcomputing/checkins/notifications/email/MailJetNotificationController.java b/server/src/main/java/com/objectcomputing/checkins/notifications/email/MailJetNotificationController.java
