Merge branch 'main' into feat/mark-for-reviw

.gitignore

@@ -6,6 +6,8 @@ dist/
 /tests/e2e/screenshots/
 coverage/
 .nyc_output/
+venv/
+
 
 # local env files
 .env.local

src/components/Omr/OmrItem.vue

@@ -231,7 +231,7 @@ import {
   onUpdated,
 } from "vue";
 
-import { quizType, questionType, DraftResponse } from "../../types";
+import { quizType, questionType, DraftResponse } from "@/types"
 
 const MAX_LENGTH_NUMERICAL_CHARACTERS: number = 10; // max length of characters in numerical answer textbox
 

src/components/Omr/OmrModal.vue

@@ -78,7 +78,7 @@ import {
 } from "vue"
 import {
   isScreenPortrait
-} from "../../services/Functional/Utilities";
+} from "@/services/Functional/Utilities";
 import {
   Question,
   SubmittedResponse,
@@ -88,7 +88,7 @@ import {
   questionSetPalette,
   TimeLimit,
   quizTitleType
-} from "../../types"
+} from "@/types"
 import { useToast, POSITION } from "vue-toastification"
 const clonedeep = require("lodash.clonedeep");
 

src/components/Questions/Body.vue

@@ -321,7 +321,7 @@ import {
   quizTitleType,
   testFormat,
   TimeLimit,
-} from "../../types";
+} from "@/types";
 import QuestionPalette from "./Palette/QuestionPalette.vue";
 
 const MAX_LENGTH_NUMERICAL_CHARACTERS: number = 10; // max length of characters in numerical answer textbox

src/components/Questions/Footer.vue

@@ -99,7 +99,7 @@ import {
   IconButtonIconConfig,
   IconButtonTitleConfig,
   quizType,
-} from "../../types";
+} from "@/types";
 import {
   defineComponent,
   ref,

src/components/Questions/Header.vue

@@ -49,7 +49,7 @@
 <script lang="ts">
 import IconButton from "../UI/Buttons/IconButton.vue";
 import { defineComponent, reactive, toRefs, computed, watch, onMounted, PropType } from "vue";
-import { quizTitleType } from "../../types";
+import { quizTitleType } from "@/types";
 
 export default defineComponent({
   name: "Header",

src/components/Questions/Palette/Item.vue

@@ -45,7 +45,7 @@ import PartialSuccess from "./PartialSuccess.vue"
 import Error from "./Error.vue";
 import Neutral from "./Neutral.vue";
 import Review from "./Review.vue";
-import { questionState } from "../../../types";
+import { questionState } from "@/types";
 
 export default defineComponent({
   name: "Item",

src/components/Questions/Palette/KeyTemplate.vue

@@ -22,7 +22,7 @@ import {
   legendKeyTextClass,
   legendKeyContainerClass,
 } from "./Utils";
-import BaseIcon from "../../../components/UI/Icons/BaseIcon.vue";
+import BaseIcon from "@/components/UI/Icons/BaseIcon.vue";
 import { defineComponent, computed } from "vue";
 
 export default defineComponent({

src/components/Questions/Palette/QuestionPalette.vue

@@ -87,7 +87,7 @@ import Neutral from "./Neutral.vue";
 import Review from "./Review.vue";
 import PaletteItem from "./Item.vue";
 import InstructionPage from "@/components/InstructionPage.vue";
-import { TimeLimit, questionSetPalette, quizTitleType, testFormat } from "../../../types";
+import { TimeLimit, questionSetPalette, quizTitleType, testFormat } from "@/types";
 import { defineComponent, computed, PropType, reactive } from "vue";
 
 export default defineComponent({

src/components/Questions/QuestionModal.vue

@@ -108,7 +108,7 @@ import {
 } from "vue"
 import {
   isScreenPortrait
-} from "../../services/Functional/Utilities";
+} from "@/services/Functional/Utilities";
 import {
   Question,
   SubmittedResponse,
@@ -119,7 +119,7 @@ import {
   TimeLimit,
   quizTitleType,
   testFormat
-} from "../../types"
+} from "@/types"
 import { useToast, POSITION } from "vue-toastification"
 const clonedeep = require("lodash.clonedeep");
 

src/components/UI/Buttons/IconButton.vue

@@ -24,7 +24,7 @@
 
 <script lang="ts">
 import { defineComponent, reactive, toRefs, computed, PropType } from "vue";
-import { IconButtonTitleConfig, IconButtonIconConfig } from "../../../types";
+import { IconButtonTitleConfig, IconButtonIconConfig } from "@/types";
 import BaseIcon from "../Icons/BaseIcon.vue";
 
 export default defineComponent({

src/components/UI/Progress/CircularProgress.vue

@@ -51,7 +51,7 @@
 
 <script lang="ts">
 import { defineComponent, reactive, toRefs, computed, PropType } from "vue";
-import { CircularProgressResult } from "../../../types";
+import { CircularProgressResult } from "@/types";
 
 export default defineComponent({
   name: "CircularProgress",

src/components/UI/Text/InputText.vue

@@ -31,7 +31,7 @@
 
 <script lang="ts">
 import { computed, PropType, defineComponent } from "vue";
-import { InputTextValidationConfig } from "../../../types";
+import { InputTextValidationConfig } from "@/types";
 import BaseIcon from "../Icons/BaseIcon.vue";
 
 export default defineComponent({

src/components/UI/Text/Textarea.vue

@@ -24,7 +24,7 @@
 
 <script lang="ts">
 import InputText from "./InputText.vue";
-import { InputTextValidationConfig, textAreaValueType } from "../../../types";
+import { InputTextValidationConfig, textAreaValueType } from "@/types";
 import { PropType, defineComponent, reactive, toRefs, watch } from "vue";
 
 export default defineComponent({

src/services/API/FormInputHandling.ts

@@ -1,6 +1,6 @@
 import {
   FormResultResponse
-} from "../../types";
+} from "@/types";
 
 export default {
   async submitFormData(formData : any, resultsQuery: boolean = false): Promise<FormResultResponse> {

src/services/API/Organization.ts

@@ -2,7 +2,7 @@ import { apiClient } from "./RootClient";
 import { authenticationEndpoint } from "./Endpoints";
 import {
   OrganizationAPIResponse
-} from "../../types";
+} from "@/types";
 
 export default {
   /**

src/services/API/Question.ts

@@ -1,6 +1,6 @@
 import { apiClient } from "./RootClient";
 import { questionsEndpoint } from "./Endpoints";
-import { Question } from "../../types";
+import { Question } from "@/types";
 
 export default {
   /**

src/services/API/Quiz.ts

@@ -1,6 +1,6 @@
 import { apiClient } from "./RootClient";
 import { quizEndpoint } from "./Endpoints";
-import { QuizAPIResponse } from "../../types";
+import { QuizAPIResponse } from "@/types";
 
 export default {
   /**

src/services/API/Session.ts

@@ -10,7 +10,7 @@ import {
   eventType,
   QuestionSetMetricPayload,
   SessionMetricsPayload
-} from "../../types";
+} from "@/types";
 import axios, { AxiosError } from "axios";
 
 export default {

src/services/Functional/Utilities.ts

@@ -1,5 +1,5 @@
-import store from "../../store/index";
-import { Question, submittedAnswer, CorrectAnswerType, answerEvaluation, QuestionBucketingMap } from "../../types";
+import store from "@/store/index";
+import { Question, submittedAnswer, CorrectAnswerType, answerEvaluation, QuestionBucketingMap } from "@/types";
 const isEqual = require("deep-eql");
 
 /**

tsconfig.json

@@ -20,6 +20,7 @@
     "lib": ["esnext", "dom", "dom.iterable", "scripthost"]
   },
   "include": [
+    "src",
     "src/**/*.ts",
     "src/**/*.tsx",
     "src/**/*.vue",

vue.config.js

@@ -1,9 +1,14 @@
+const path = require("path");
+
 module.exports = {
   publicPath: "/",
   transpileDependencies: [/@vue\/*/, "vue-router", "vuex"],
   chainWebpack(config) {
     // reference: https://github.com/vuejs/vue-cli/issues/979#issuecomment-372990631
     config.plugins.delete("prefetch");
+
+    // Adding alias configuration for absolute imports
+    config.resolve.alias.set("@", path.resolve(__dirname, "src"));
   },
   parallel: false,
   // https://www.npmjs.com/package/@vue/cli-plugin-babel