decouple courses (#677)

- **remove UIMocks...**
- **export individual courses, remove default export...**

Author: NiloCK

packages/courses/src/index.ts

@@ -14,6 +14,15 @@ import sightSing from './sightsing';
 import typing from './typing';
 import wordWork from './word-work';
 
+export { default as chess } from './chess';
+export { default as french } from './french';
+export { default as math } from './math';
+export { default as piano } from './piano';
+export { default as pitch } from './pitch';
+export { default as sightSing } from './sightsing';
+export { default as typing } from './typing';
+export { default as wordWork } from './word-work';
+
 export { BlanksCard, BlanksCardDataShapes } from './default/questions/fillIn';
 export { default as gradeSpellingAttempt } from './default/questions/fillIn/blanksCorrection';
 
@@ -199,7 +208,7 @@ export class CourseList {
   }
 }
 
-const courseList: CourseList = new CourseList([
+export const allCourses: CourseList = new CourseList([
   math,
   wordWork,
   french,
@@ -210,5 +219,3 @@ const courseList: CourseList = new CourseList([
   chess,
   typing,
 ]);
-
-export default courseList;

packages/db/src/study/getCardDataShape.ts

@@ -1,11 +1,11 @@
-import Courses from '@vue-skuilder/courses';
+import { allCourses } from '@vue-skuilder/courses';
 import { log, NameSpacer, CourseConfig, DataShape } from '@vue-skuilder/common';
 import { CardData, DisplayableData } from '@/core';
 import { getCourseDB } from '@/impl/pouch/courseAPI';
 
 export async function getCardDataShape(courseID: string, cardID: string) {
   const dataShapes: DataShape[] = [];
-  Courses.courses.forEach((course) => {
+  allCourses.courses.forEach((course) => {
     course.questions.forEach((question) => {
       question.dataShapes.forEach((ds) => {
         dataShapes.push(ds);

packages/platform-ui/src/components/Courses/CourseCardBrowser.vue

@@ -108,7 +108,7 @@
 import { displayableDataToViewData } from '@vue-skuilder/common';
 import TagsInput from '@/components/Edit/TagsInput.vue';
 import { PaginatingToolbar, ViewComponent, CardLoader } from '@vue-skuilder/common-ui';
-import Courses from '@vue-skuilder/courses';
+import { allCourses } from '@vue-skuilder/courses';
 import { getDataLayer, CourseDBInterface, CardData, DisplayableData, Tag } from '@vue-skuilder/db';
 import { defineComponent } from 'vue';
 import { alertUser } from '@vue-skuilder/common-ui';
@@ -160,7 +160,7 @@ export default defineComponent({
       userIsRegistered: false,
       questionCount: 0,
       tags: [] as Tag[],
-      viewLookup: Courses.getView,
+      viewLookup: allCourses.getView,
     };
   },
 
@@ -279,7 +279,9 @@ export default defineComponent({
           console.error(`No valid data found for card ${_cardID}`);
           return;
         }
-        const tmpView: ViewComponent = Courses.getView(tmpCardData.id_view || 'default.question.BlanksCard.FillInView');
+        const tmpView: ViewComponent = allCourses.getView(
+          tmpCardData.id_view || 'default.question.BlanksCard.FillInView'
+        );
 
         const tmpDataDocs = tmpCardData.id_displayable_data.map((id) => {
           return this.courseDB!.getCourseDoc<DisplayableData>(id, {

packages/platform-ui/src/components/Courses/EloModeration.vue

@@ -28,7 +28,7 @@
 
 <script lang="ts">
 import { CardLoader } from '@vue-skuilder/common-ui';
-import Courses from '@vue-skuilder/courses';
+import { allCourses } from '@vue-skuilder/courses';
 import { CourseElo, adjustCourseScores, CourseConfig } from '@vue-skuilder/common';
 import { CourseDBInterface, getDataLayer } from '@vue-skuilder/db';
 import { defineComponent } from 'vue';
@@ -62,7 +62,7 @@ export default defineComponent({
       id2: '',
       elo1: null as CourseElo | null,
       elo2: null as CourseElo | null,
-      viewLookup: Courses.getView,
+      viewLookup: allCourses.getView,
     };
   },
 

packages/platform-ui/src/components/Edit/ComponentRegistration/ComponentRegistration.vue

@@ -30,7 +30,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { Displayable } from '@vue-skuilder/common-ui';
-import Courses from '@vue-skuilder/courses';
+import { allCourses } from '@vue-skuilder/courses';
 import { getDataLayer, CourseDBInterface } from '@vue-skuilder/db';
 import {
   NameSpacer,
@@ -84,9 +84,9 @@ export default defineComponent({
     this.courseDatashapes = this.courseConfig.dataShapes;
     this.courseQuestionTypes = this.courseConfig.questionTypes;
 
-    const dataShapeData = Courses.allDataShapes();
+    const dataShapeData = allCourses.allDataShapes();
 
-    Courses.allDataShapesRaw().forEach((ds) => {
+    allCourses.allDataShapesRaw().forEach((ds) => {
       console.log(`[ComponentRegistration] Datashape:\n${JSON.stringify(ds)}`);
     });
 
@@ -98,19 +98,19 @@ export default defineComponent({
       this.dataShapes.push({
         name: shape.dataShape,
         course: shape.course,
-        dataShape: Courses.getDataShape(shape),
+        dataShape: allCourses.getDataShape(shape),
         registered: index !== undefined,
         displayable: shape.displayable,
       });
     });
 
     this.dataShapes = _.sortBy(this.dataShapes, ['registered', 'name']);
 
-    const courseNameList = Courses.courses.map((course) => course.name);
+    const courseNameList = allCourses.courses.map((course) => course.name);
     const questionData: Array<[QuestionDescriptor, typeof Displayable]> = [];
 
     courseNameList.forEach((course) => {
-      const courseQs = Courses.getCourse(course)!.questions;
+      const courseQs = allCourses.getCourse(course)!.questions;
 
       courseQs.forEach((courseQ) => {
         questionData.push([

packages/platform-ui/src/components/Edit/CourseEditor.vue

@@ -30,7 +30,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import ComponentRegistration from '@/components/Edit/ComponentRegistration/ComponentRegistration.vue';
-import Courses from '@vue-skuilder/courses';
+import { allCourses } from '@vue-skuilder/courses';
 import { BlanksCard, BlanksCardDataShapes } from '@vue-skuilder/courses';
 import { CourseConfig, NameSpacer, DataShape } from '@vue-skuilder/common';
 import DataInputForm from './ViewableDataInputForm/DataInputForm.vue';
@@ -93,7 +93,7 @@ export default defineComponent({
 
     // #55 make all 'programmed' datashapes available, rather than
     // the previous code-based name scoping
-    Courses.courses.forEach((course) => {
+    allCourses.courses.forEach((course) => {
       course.questions.forEach((question) => {
         question.dataShapes.forEach((ds) => {
           this.dataShapes.push(ds);

packages/platform-ui/src/components/Edit/ViewableDataInputForm/DataInputForm.vue

@@ -86,7 +86,7 @@ import CardBrowser from '@/components/Edit/CardBrowser.vue';
 import TagsInput, { TagsInputInstance } from '@/components/Edit/TagsInput.vue';
 import { FieldInputInstance, isFieldInput } from '@/components/Edit/ViewableDataInputForm/FieldInput.types';
 import { alertUser } from '@vue-skuilder/common-ui';
-import Courses from '@vue-skuilder/courses';
+import { allCourses } from '@vue-skuilder/courses';
 import { getDataLayer, CourseDBInterface } from '@vue-skuilder/db';
 import { FieldType, Status, CourseConfig, NameSpacer, ShapeDescriptor } from '@vue-skuilder/common';
 import _ from 'lodash';
@@ -497,7 +497,7 @@ export default defineComponent({
         console.log('[DataInputForm] this.dataShape.name', this.dataShape.name);
 
         if (descriptor.dataShape === this.dataShape.name) {
-          const crs = Courses.getCourse(descriptor.course)!;
+          const crs = allCourses.getCourse(descriptor.course)!;
 
           this.shapeViews = [];
 

packages/platform-ui/src/main.ts

@@ -26,8 +26,8 @@ import { initializeDataLayer } from '@vue-skuilder/db';
   const pinia = createPinia();
   const app = createApp(App);
 
-  // Dynamically import Courses
-  const { default: Courses } = await import('@vue-skuilder/courses');
+  // Dynamically import { allCourses }
+  const { allCourses: Courses } = await import('@vue-skuilder/courses');
 
   // Register all view components globally
   const viewComponents = Courses.allViewsRaw();