From 49668387bfe2b3951bb76ce093860a9071f76b3a Mon Sep 17 00:00:00 2001
From: David Nisson <d.m.nisson@gmail.com>
Date: Wed, 9 Dec 2020 19:59:28 -0800
Subject: [PATCH 1/6] allow keyboard navigation on labels to behave like the
 actual radio buttons would if they weren't hidden

---
 .../StudentDashboard/SubjectSelection/PresessionSurvey.vue  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/DashboardView/StudentDashboard/SubjectSelection/PresessionSurvey.vue b/src/views/DashboardView/StudentDashboard/SubjectSelection/PresessionSurvey.vue
index d3a0bb9a..c22babcc 100644
--- a/src/views/DashboardView/StudentDashboard/SubjectSelection/PresessionSurvey.vue
+++ b/src/views/DashboardView/StudentDashboard/SubjectSelection/PresessionSurvey.vue
@@ -22,7 +22,11 @@
               :id="`${question.key}_${option.value}`"
               :value="option.value"
             />
-            <label :for="`${question.key}_${option.value}`">
+            <label
+              :for="`${question.key}_${option.value}`"
+              tabindex="0"
+              @keydown.space="responses[question.key].answer = option.value"
+            >
               <span>{{ option.displayName }}</span>
               <input
                 v-if="option.value === 'other'"

From 4edced6068338bf9174c73090ec1502e2e4f7f0b Mon Sep 17 00:00:00 2001
From: David Sudia <dsudia@gmail.com>
Date: Wed, 23 Dec 2020 22:33:59 +0000
Subject: [PATCH 2/6] Migrate ci to gitlab

---
 .circleci/config.yml | 25 ------------------
 .gitlab-ci.yml       | 60 ++++++++++++++++++++++++++++++++++++++++++++
 .tool-versions       |  2 +-
 Dockerfile           | 22 ----------------
 bin/build.sh         | 50 ++++++++++++++++++++++++++++++++++++
 package.json         |  4 +--
 6 files changed, 113 insertions(+), 50 deletions(-)
 delete mode 100644 .circleci/config.yml
 create mode 100644 .gitlab-ci.yml
 delete mode 100644 Dockerfile
 create mode 100755 bin/build.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index fb76dd47..00000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Check https://circleci.com/docs/2.0/language-javascript/ for more details
-
-version: 2
-jobs:
-  build:
-    docker:
-      - image: circleci/node:11-browsers
-
-    working_directory: ~/repo
-
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - v1-dependencies-{{ checksum "package.json" }}
-            # fallback to using the latest cache if no exact match is found
-            - v1-dependencies-
-      - run: npm install
-      - save_cache:
-          paths:
-            - node_modules
-          key: v1-dependencies-{{ checksum "package.json" }}
-      - run: npm run test
-      - run: npm run lint:prod
-      - run: npm run build
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 00000000..c93252b5
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,60 @@
+include:
+  - template: Auto-DevOps.gitlab-ci.yml
+
+build:
+  stage: build
+  image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-build-image:v0.4.0"
+  variables:
+    DOCKER_TLS_CERTDIR: ""
+  services:
+    - docker:19.03.12-dind
+  script:
+    - |
+      if [[ -z "$CI_COMMIT_TAG" ]]; then
+        export CI_APPLICATION_REPOSITORY=${CI_APPLICATION_REPOSITORY:-$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG}
+        export CI_APPLICATION_TAG=${CI_APPLICATION_TAG:-$CI_COMMIT_SHA}
+      else
+        export CI_APPLICATION_REPOSITORY=${CI_APPLICATION_REPOSITORY:-$CI_REGISTRY_IMAGE}
+        export CI_APPLICATION_TAG=${CI_APPLICATION_TAG:-$CI_COMMIT_TAG}
+      fi
+    - ./bin/build.sh
+  rules:
+    - if: '$CI_COMMIT_TAG || $CI_COMMIT_BRANCH'
+
+cache:
+  key: ${CI_COMMIT_REF_SLUG}
+  paths:
+    - .npm
+    - node_modules
+
+variables:
+  AUTO_DEVOPS_BUILD_IMAGE_CNB_ENABLED: "true"
+  AUTO_DEVOPS_BUILD_IMAGE_CNB_BUILDER: "heroku/buildpacks:20"
+  BUILDPACK_URL: "heroku/nodejs"
+  npm_config_cache: "$CI_PROJECT_DIR/.npm"
+
+test:
+  stage: test
+  image: node:12.20.0-stretch
+  before_script:
+    - npm ci --cache .npm --prefer-offline
+  script:
+    - npm install
+    - npm run test
+  rules:
+    - if: '$TEST_DISABLED'
+      when: never
+    - if: '$CI_COMMIT_TAG || $CI_COMMIT_BRANCH'
+
+lint:
+  stage: test
+  image: node:12.20.0-stretch
+  before_script:
+    - npm ci --cache .npm --prefer-offline
+  script:
+    - npm install
+    - npm run lint:prod
+  rules:
+    - if: '$TEST_DISABLED'
+      when: never
+    - if: '$CI_COMMIT_TAG || $CI_COMMIT_BRANCH'
diff --git a/.tool-versions b/.tool-versions
index 6d0c49d0..ce931746 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1 +1 @@
-nodejs 11.7.0
+nodejs 12.20.0
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 3d8bfc2b..00000000
--- a/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM node:lts-alpine
-
-# install simple http server for serving static content
-RUN npm install -g http-server
-
-# make the 'app' folder the current working directory
-WORKDIR /app
-
-# copy both 'package.json' and 'package-lock.json' (if available)
-COPY package*.json ./
-
-# install project dependencies
-RUN npm install
-
-# copy project files and folders to the current working directory (i.e. 'app' folder)
-COPY . .
-
-# build app for development
-RUN npm run build
-
-EXPOSE 8080
-CMD [ "http-server", "dist" ]
\ No newline at end of file
diff --git a/bin/build.sh b/bin/build.sh
new file mode 100755
index 00000000..73557545
--- /dev/null
+++ b/bin/build.sh
@@ -0,0 +1,50 @@
+#!/bin/bash -e
+
+# build stage script for Auto-DevOps
+
+if ! docker info &>/dev/null; then
+  if [ -z "$DOCKER_HOST" ] && [ "$KUBERNETES_PORT" ]; then
+    export DOCKER_HOST='tcp://localhost:2375'
+  fi
+fi
+
+if [[ -n "$CI_REGISTRY" && -n "$CI_REGISTRY_USER" ]]; then
+  echo "Logging to GitLab Container Registry with CI credentials..."
+  echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"
+fi
+
+image_previous="$CI_APPLICATION_REPOSITORY:$CI_COMMIT_BEFORE_SHA"
+image_tagged="$CI_APPLICATION_REPOSITORY:$CI_APPLICATION_TAG"
+image_latest="$CI_APPLICATION_REPOSITORY:latest"
+
+builder=${AUTO_DEVOPS_BUILD_IMAGE_CNB_BUILDER:-"heroku/buildpacks:18"}
+echo "Building Cloud Native Buildpack-based application with builder ${builder}..."
+buildpack_args=()
+if [[ -n "$BUILDPACK_URL" ]]; then
+  buildpack_args=('--buildpack' "$BUILDPACK_URL")
+fi
+env_args=()
+if [[ -n "$AUTO_DEVOPS_BUILD_IMAGE_FORWARDED_CI_VARIABLES" ]]; then
+  mapfile -t env_arg_names < <(echo "$AUTO_DEVOPS_BUILD_IMAGE_FORWARDED_CI_VARIABLES" | tr ',' "\n")
+  for env_arg_name in "${env_arg_names[@]}"; do
+    env_args+=('--env' "$env_arg_name")
+  done
+fi
+pack build "$image_tagged" \
+  --builder "$builder" \
+  "${env_args[@]}" \
+  "${buildpack_args[@]}" \
+  --env HTTP_PROXY \
+  --env http_proxy \
+  --env HTTPS_PROXY \
+  --env https_proxy \
+  --env FTP_PROXY \
+  --env ftp_proxy \
+  --env NO_PROXY \
+  --env no_proxy \
+  --env "NODE_ENV=production"
+
+docker tag "$image_tagged" "$image_latest"
+
+docker push "$image_tagged"
+docker push "$image_latest"
diff --git a/package.json b/package.json
index ddd7506e..313a3f56 100644
--- a/package.json
+++ b/package.json
@@ -67,8 +67,8 @@
     "vuex": "^3.0.1"
   },
   "engines": {
-    "node": ">= 11.7.0",
-    "npm": ">= 6.0.0"
+    "node": "^12.20.0",
+    "npm": "^6.14.8"
   },
   "devDependencies": {
     "cypress-file-upload": "^4.0.7",

From c7e709c603e4322e4b63873e1963e439cd79e232 Mon Sep 17 00:00:00 2001
From: Dave Sudia <dsudia@gospotcheck.com>
Date: Wed, 23 Dec 2020 15:35:24 -0700
Subject: [PATCH 3/6] remvoe circleci badge from readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 15d4443e..5835b258 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 > Online tutoring platform built with Vue.js and Webpack
 
-[![CircleCI](https://circleci.com/gh/UPchieve/web.svg?style=svg)](https://circleci.com/gh/UPchieve/web) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](code_of_conduct.md)
+[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](code_of_conduct.md)
 
 ## GITLAB
 

From f3a31b440ee2320375de1c442cb06ef544e0dea1 Mon Sep 17 00:00:00 2001
From: Dave Sudia <dsudia@gospotcheck.com>
Date: Wed, 23 Dec 2020 15:55:53 -0700
Subject: [PATCH 4/6] exclude cache on build job

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c93252b5..ed64b4c7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,7 @@ include:
 build:
   stage: build
   image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-build-image:v0.4.0"
+  cache: {}
   variables:
     DOCKER_TLS_CERTDIR: ""
   services:

From f37df9133a1a9f2db1257c43e6065339d19f997d Mon Sep 17 00:00:00 2001
From: David Nisson <d.m.nisson@gmail.com>
Date: Tue, 5 Jan 2021 20:44:18 -0800
Subject: [PATCH 5/6] create tab trap in modal and remove hidden input elements
 from tab flow

---
 src/components/App/AppModal/ModalTemplate.vue | 46 ++++++++++++++++++-
 .../SubjectSelection/PresessionSurvey.vue     |  2 +
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/src/components/App/AppModal/ModalTemplate.vue b/src/components/App/AppModal/ModalTemplate.vue
index 516f91fc..a5631aa7 100644
--- a/src/components/App/AppModal/ModalTemplate.vue
+++ b/src/components/App/AppModal/ModalTemplate.vue
@@ -1,8 +1,10 @@
 <template>
   <div
     class="ModalTemplate"
+    ref="modalTemplateContainer"
     :class="{ 'ModalTemplate--important': important }"
     @click="closeModal"
+    @keydown="checkKeyEvent"
   >
     <div v-if="mobileMode" class="ModalTemplate-header">
       <div
@@ -78,8 +80,48 @@ export default {
     closeModal(event) {
       // users must interact with the modal button to close session related modals
       if (this.isSessionFulfilledModal) return;
-      const { target } = event;
-      if (target.classList.contains("ModalTemplate")) this.handleCancel();
+      const { key, target } = event;
+      if (key === "Escape" || target.classList.contains("ModalTemplate")) {
+        this.handleCancel();
+      }
+    },
+    checkKeyEvent(event) {
+      // based on tab key trap at:
+      // https://gist.github.com/JimSchofield/ec06d1f209799f5cd279f5683b178da4
+      const { key } = event;
+
+      if (key === "Escape") {
+        // treat as a close event and exit early
+        this.closeModal(event);
+        return;
+      }
+
+      const focusableList = this.$refs.modalTemplateContainer.querySelectorAll(
+        'button:not([disabled]), [href], input:not([tabindex="-1"]), select, textarea, [tabindex]:not([tabindex="-1"])'
+      );
+
+      // escape early if only 1 or no elements to focus
+      if (focusableList.length < 2 && event.key === "Tab") {
+        event.preventDefault();
+        return;
+      }
+
+      const last = focusableList.length - 1;
+      if (
+        event.key === "Tab" &&
+        event.shiftKey === false &&
+        event.target === focusableList[last]
+      ) {
+        event.preventDefault();
+        focusableList[0].focus();
+      } else if (
+        event.key === "Tab" &&
+        event.shiftKey === true &&
+        event.target === focusableList[0]
+      ) {
+        event.preventDefault();
+        focusableList[last].focus();
+      }
     }
   }
 };
diff --git a/src/views/DashboardView/StudentDashboard/SubjectSelection/PresessionSurvey.vue b/src/views/DashboardView/StudentDashboard/SubjectSelection/PresessionSurvey.vue
index c22babcc..d10230ca 100644
--- a/src/views/DashboardView/StudentDashboard/SubjectSelection/PresessionSurvey.vue
+++ b/src/views/DashboardView/StudentDashboard/SubjectSelection/PresessionSurvey.vue
@@ -19,6 +19,7 @@
             <input
               v-model="responses[question.key].answer"
               type="radio"
+              tabindex="-1"
               :id="`${question.key}_${option.value}`"
               :value="option.value"
             />
@@ -31,6 +32,7 @@
               <input
                 v-if="option.value === 'other'"
                 type="text"
+                tabindex="-1"
                 v-model="responses[question.key].other"
                 :disabled="responses[question.key].answer !== 'other'"
               />

From e2d4c3baa612d2932c771e33a31e2ab5ed600859 Mon Sep 17 00:00:00 2001
From: David Nisson <d.m.nisson@gmail.com>
Date: Tue, 5 Jan 2021 21:15:13 -0800
Subject: [PATCH 6/6] put focus on first focusable element so that we start out
 in the tab trap

---
 src/components/App/AppModal/ModalTemplate.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/App/AppModal/ModalTemplate.vue b/src/components/App/AppModal/ModalTemplate.vue
index a5631aa7..cb8a56c7 100644
--- a/src/components/App/AppModal/ModalTemplate.vue
+++ b/src/components/App/AppModal/ModalTemplate.vue
@@ -46,6 +46,9 @@ import { mapGetters } from "vuex";
 import LargeButton from "@/components/LargeButton";
 import ArrowIcon from "@/assets/arrow.svg";
 
+const FOCUSABLE_ELEMENT_SELECTOR =
+  'button:not([disabled]), [href], input:not([tabindex="-1"]), select, textarea, [tabindex]:not([tabindex="-1"])';
+
 export default {
   components: { LargeButton, ArrowIcon },
   props: {
@@ -61,6 +64,11 @@ export default {
   mounted() {
     const body = document.querySelector("body");
     body.classList.add("disable-scroll");
+
+    // focus on first focusable child element, to put the focus in the trap
+    this.$refs.modalTemplateContainer
+      .querySelectorAll(FOCUSABLE_ELEMENT_SELECTOR)[0]
+      .focus();
   },
   beforeDestroy() {
     const body = document.querySelector("body");
@@ -97,7 +105,7 @@ export default {
       }
 
       const focusableList = this.$refs.modalTemplateContainer.querySelectorAll(
-        'button:not([disabled]), [href], input:not([tabindex="-1"]), select, textarea, [tabindex]:not([tabindex="-1"])'
+        FOCUSABLE_ELEMENT_SELECTOR
       );
 
       // escape early if only 1 or no elements to focus