use db package

NiloCK · NiloCK · commit 8ce74619c9a7 · 2025-03-11T08:19:22.000-03:00
diff --git a/packages/vue/src/App.vue b/packages/vue/src/App.vue
@@ -62,7 +62,7 @@ import { ref, computed, onBeforeMount, onMounted, watch } from 'vue';
 import { useTheme } from 'vuetify';
 import UserLoginAndRegistrationContainer from '@/components/UserLoginAndRegistrationContainer.vue';
 import SnackbarService from '@/components/SnackbarService.vue';
-import { getLatestVersion } from '@/db';
+import { getLatestVersion } from '@vue-skuilder/db';
 import { useConfigStore } from '@/stores/useConfigStore';
 import { useAuthStore } from '@/stores/useAuthStore';
 
diff --git a/packages/vue/src/base-course/Interfaces/DataShape.ts b/packages/vue/src/base-course/Interfaces/DataShape.ts
@@ -1,3 +1,5 @@
+// [ ] remove this file - duplicated in `common` package
+
 import { FieldDefinition } from '../../base-course/Interfaces/FieldDefinition';
 import { DataShapeName } from '../../enums/DataShapeNames';
 
diff --git a/packages/vue/src/base-course/Interfaces/ViewData.ts b/packages/vue/src/base-course/Interfaces/ViewData.ts
@@ -1,4 +1,4 @@
-import { DisplayableData } from '../../db/types';
+import { DisplayableData } from '@vue-skuilder/db';
 
 export interface ViewData {
   [index: string]: string | number | Blob | boolean;
diff --git a/packages/vue/src/components/Classrooms/ClassroomCtrlPanel.vue b/packages/vue/src/components/Classrooms/ClassroomCtrlPanel.vue
@@ -76,10 +76,15 @@
 
 <script lang="ts">
 import moment from 'moment';
-import TeacherClassroomDB, { AssignedContent, AssignedTag } from '@/db/classroomDB';
-import { getCourseList, getCourseTagStubs } from '@/db/courseDB';
-import { Tag } from '@/db/types';
-import { ClassroomConfig, CourseConfig } from '@/server/types';
+import {
+  TeacherClassroomDB,
+  AssignedContent,
+  AssignedTag,
+  getCourseList,
+  getCourseTagStubs,
+  Tag,
+} from '@vue-skuilder/db';
+import { ClassroomConfig, CourseConfig } from '@vue-skuilder/common';
 import { defineComponent } from 'vue';
 import { getCurrentUser } from '@/stores/useAuthStore';
 
diff --git a/packages/vue/src/components/Classrooms/CreateClassroom.vue b/packages/vue/src/components/Classrooms/CreateClassroom.vue
@@ -45,10 +45,9 @@
 import moment from 'moment';
 import Mousetrap from 'mousetrap';
 import { log } from '@/logshim';
-import { registerUserForClassroom } from '../../db/userDB';
-import { Status } from '@vue-skuilder/common';
+import { registerUserForClassroom } from '@vue-skuilder/db';
+import { Status, ClassroomConfig, CreateClassroom, ServerRequestType } from '@vue-skuilder/common';
 import serverRequest from '../../server';
-import { ClassroomConfig, CreateClassroom, ServerRequestType } from '@vue-skuilder/common';
 import { alertUser } from '../SnackbarService.vue';
 import { defineComponent } from 'vue';
 import { getCurrentUser } from '@/stores/useAuthStore';
diff --git a/packages/vue/src/components/Classrooms/JoinCode.vue b/packages/vue/src/components/Classrooms/JoinCode.vue
@@ -17,8 +17,8 @@
 
 <script lang="ts">
 import { log } from '@/logshim';
-import TeacherClassroomDB from '../../db/classroomDB';
-import { ClassroomConfig } from '../../server/types';
+import { TeacherClassroomDB } from '@vue-skuilder/db';
+import { ClassroomConfig } from '@vue-skuilder/common';
 import { defineComponent } from 'vue';
 
 export default defineComponent({
diff --git a/packages/vue/src/components/Courses/CourseCardBrowser.vue b/packages/vue/src/components/Courses/CourseCardBrowser.vue
@@ -110,10 +110,18 @@ import TagsInput from '@/components/Edit/TagsInput.vue';
 import PaginatingToolbar from '@/components/PaginatingToolbar.vue';
 import CardLoader from '@/components/Study/CardLoader.vue';
 import Courses from '@/courses';
-import { getCourseDB, getCourseDoc, getCourseDocs } from '@/db';
-import { CourseDB, getTag } from '@/db/courseDB';
-import { removeTagFromCard } from '@/db/courseDB';
-import { CardData, DisplayableData, DocType, Tag } from '@/db/types';
+import {
+  getCourseDB,
+  getCourseDoc,
+  getCourseDocs,
+  CourseDB,
+  getTag,
+  removeTagFromCard,
+  CardData,
+  DisplayableData,
+  DocType,
+  Tag,
+} from '@vue-skuilder/db';
 import { defineComponent } from 'vue';
 import { alertUser } from '../SnackbarService.vue';
 import { Status } from '@vue-skuilder/common';
diff --git a/packages/vue/src/components/Courses/CourseInformation.vue b/packages/vue/src/components/Courses/CourseInformation.vue
@@ -59,12 +59,10 @@
 <script lang="ts">
 import { defineComponent, PropType } from 'vue';
 import MidiConfig from '@/courses/piano/utility/MidiConfig.vue';
-import { log } from '@/logshim';
-import { CourseDB, getCourseConfig, getCourseTagStubs } from '@/db/courseDB';
-import { Tag } from '@/db/types';
-import { CourseConfig } from '@/server/types';
 import CourseCardBrowser from './CourseCardBrowser.vue';
-import { User } from '@/db/userDB';
+import { log } from '@/logshim';
+import { CourseDB, getCourseConfig, getCourseTagStubs, Tag, User } from '@vue-skuilder/db';
+import { CourseConfig } from '@vue-skuilder/common';
 import { getCurrentUser } from '@/stores/useAuthStore';
 
 export default defineComponent({
diff --git a/packages/vue/src/components/Courses/CourseRouter.vue b/packages/vue/src/components/Courses/CourseRouter.vue
@@ -44,8 +44,8 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { disambiguateCourse, getCachedCourseList } from '@/db/courseDB';
-import { CourseConfig } from '@/server/types';
+import { disambiguateCourse, getCachedCourseList } from '@vue-skuilder/db';
+import { CourseConfig } from '@vue-skuilder/common';
 import CourseEditor from './CourseEditor.vue';
 import CourseInformation from './CourseInformation.vue';
 
diff --git a/packages/vue/src/components/Courses/CourseStubCard.vue b/packages/vue/src/components/Courses/CourseStubCard.vue
@@ -22,10 +22,10 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { log } from '@/logshim';
-import { getCourseDB } from '@/db';
-import { getCourseConfig } from '@/db/courseDB';
-import { DocType } from '@/db/types';
-import { CourseConfig } from '@/server/types';
+import { getCourseDB } from '@vue-skuilder/db';
+import { getCourseConfig } from '@vue-skuilder/db';
+import { DocType } from '@vue-skuilder/db';
+import { CourseConfig } from '@vue-skuilder/common';
 import { useRouter } from 'vue-router';
 import { getCurrentUser } from '@/stores/useAuthStore';
 
diff --git a/packages/vue/src/components/Courses/EloModeration.vue b/packages/vue/src/components/Courses/EloModeration.vue
@@ -29,7 +29,7 @@
 <script lang="ts">
 import CardLoader from '@/components/Study/CardLoader.vue';
 import { CourseElo, adjustCourseScores, CourseConfig } from '@vue-skuilder/common';
-import { CourseDB, getCourseConfig, updateCardElo } from '@/db/courseDB';
+import { CourseDB, getCourseConfig, updateCardElo } from '@vue-skuilder/db';
 import { defineComponent } from 'vue';
 
 export default defineComponent({
diff --git a/packages/vue/src/components/Courses/TagInformation.vue b/packages/vue/src/components/Courses/TagInformation.vue
@@ -63,9 +63,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { getCredentialledCourseConfig } from '@/db/courseAPI';
-import { getTag, updateTag } from '@/db/courseDB';
-import { DocType, Tag } from '@/db/types';
+import { getCredentialledCourseConfig, getTag, updateTag, DocType, Tag } from '@vue-skuilder/db';
 import { Status, CourseConfig } from '@vue-skuilder/common';
 import CourseCardBrowser from './CourseCardBrowser.vue';
 import { alertUser } from '../SnackbarService.vue';
diff --git a/packages/vue/src/components/Edit/ComponentRegistration/ComponentRegistration.vue b/packages/vue/src/components/Edit/ComponentRegistration/ComponentRegistration.vue
@@ -33,8 +33,7 @@ import { Displayable } from '@/base-course/Displayable';
 import { DataShape } from '@/base-course/Interfaces/DataShape';
 import Courses from '@/courses';
 import { NameSpacer, QuestionDescriptor } from '@/courses/NameSpacer';
-import { addNote55, getCredentialledCourseConfig } from '@/db/courseAPI';
-import { updateCredentialledCourseConfig } from '@/db/courseDB';
+import { addNote55, getCredentialledCourseConfig, updateCredentialledCourseConfig } from '@vue-skuilder/db';
 import { CourseConfig, DataShape55, QuestionType55 } from '@vue-skuilder/common';
 import * as _ from 'lodash';
 import { getCurrentUser } from '@/stores/useAuthStore';
diff --git a/packages/vue/src/components/Edit/CourseEditor.vue b/packages/vue/src/components/Edit/CourseEditor.vue
@@ -34,9 +34,9 @@ import ComponentRegistration from '@/components/Edit/ComponentRegistration/Compo
 import Courses from '@/courses';
 import { NameSpacer } from '@/courses/NameSpacer';
 import { BlanksCard, BlanksCardDataShapes } from '@/courses/default/questions/fillIn';
-import { CourseConfig } from '../../server/types';
+import { CourseConfig } from '@vue-skuilder/common';
 import DataInputForm from './ViewableDataInputForm/DataInputForm.vue';
-import { getCredentialledCourseConfig } from '@/db/courseAPI';
+import { getCredentialledCourseConfig } from '@vue-skuilder/db';
 import { useDataInputFormStore } from '@/stores/useDataInputFormStore';
 
 export default defineComponent({
diff --git a/packages/vue/src/components/Edit/TagsInput.vue b/packages/vue/src/components/Edit/TagsInput.vue
@@ -24,13 +24,11 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { addTagToCard } from '@/db/courseAPI';
-import { getAppliedTags, getCourseTagStubs, removeTagFromCard } from '@/db/courseDB';
-import type { Tag } from '@/db/types';
+import { addTagToCard, getAppliedTags, getCourseTagStubs, removeTagFromCard, Tag } from '@vue-skuilder/db';
 // @ts-expect-error - suppress TS error for VueTagsInput - no types available
 import { VueTagsInput } from '@vojtechlanka/vue-tags-input';
 
-interface TagObject {
+export interface TagObject {
   text: string;
   style?: string;
   classes?: string;
diff --git a/packages/vue/src/components/Edit/ViewableDataInputForm/DataInputForm.vue b/packages/vue/src/components/Edit/ViewableDataInputForm/DataInputForm.vue
@@ -86,8 +86,7 @@ import { FieldInputInstance, isFieldInput } from '@/components/Edit/ViewableData
 import { alertUser } from '@/components/SnackbarService.vue';
 import Courses from '@/courses';
 import { NameSpacer, ShapeDescriptor } from '@/courses/NameSpacer';
-import { addNote55 } from '@/db/courseAPI';
-import { getCourseTagStubs } from '@/db/courseDB';
+import { addNote55, getCourseTagStubs } from '@vue-skuilder/db';
 import { FieldType } from '@/enums/FieldType';
 import { Status, CourseConfig } from '@vue-skuilder/common';
 import _ from 'lodash';
diff --git a/packages/vue/src/components/HeatMap.vue b/packages/vue/src/components/HeatMap.vue
@@ -27,16 +27,16 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { CardHistory, CardRecord } from '@/db/types';
+import { CardHistory, CardRecord } from '@vue-skuilder/db';
 import moment from 'moment';
 import { getCurrentUser } from '@/stores/useAuthStore';
 
-interface DayData {
+export interface DayData {
   date: string;
   count: number;
 }
 
-interface Color {
+export interface Color {
   h: number;
   s: number;
   l: number;
diff --git a/packages/vue/src/components/Study/CardLoader.vue b/packages/vue/src/components/Study/CardLoader.vue
@@ -16,10 +16,10 @@
 import { defineComponent } from 'vue';
 import Courses from '@/courses';
 import { displayableDataToViewData, ViewData } from '@/base-course/Interfaces/ViewData';
-import { CardData, CardRecord, DisplayableData } from '@/db/types';
+import { CardData, CardRecord, DisplayableData } from '@vue-skuilder/db';
 import { log } from '@/logshim';
 import CardViewer from './CardViewer.vue';
-import { getCourseDoc } from '@/db';
+import { getCourseDoc } from '@vue-skuilder/db';
 import { ViewComponent } from '@/base-course/Displayable';
 
 export default defineComponent({
diff --git a/packages/vue/src/components/Study/CardViewer.vue b/packages/vue/src/components/Study/CardViewer.vue
@@ -18,7 +18,7 @@
 import { defineComponent, PropType } from 'vue';
 import { ViewData } from '@/base-course/Interfaces/ViewData';
 import Courses from '@/courses';
-import { CardRecord } from '@/db/types';
+import { CardRecord } from '@vue-skuilder/db';
 import { CourseElo } from '@vue-skuilder/common';
 import { ViewComponent } from '@/base-course/Displayable';
 
diff --git a/packages/vue/src/components/Study/SessionConfiguration.vue b/packages/vue/src/components/Study/SessionConfiguration.vue
@@ -68,14 +68,11 @@
 
 <script lang="ts">
 import { defineComponent, PropType } from 'vue';
-import { CourseRegistration, User } from '@/db/userDB';
-import { getCourseName } from '@/db/courseDB';
 import SkldrMouseTrap from '@/SkldrMouseTrap';
-import { StudentClassroomDB } from '@/db/classroomDB';
-import { ContentSourceID } from '@/db/contentSource';
+import { CourseRegistration, User, getCourseName, StudentClassroomDB, ContentSourceID } from '@vue-skuilder/db';
 import { getCurrentUser } from '@/stores/useAuthStore';
 
-interface SessionConfigMetaData {
+export interface SessionConfigMetaData {
   selected: boolean;
   name: string;
   reviews: number;
diff --git a/packages/vue/src/components/User/UserStats.vue b/packages/vue/src/components/User/UserStats.vue
@@ -11,7 +11,7 @@
 
 <script setup lang="ts">
 import { ref, onMounted } from 'vue';
-import { User } from '@/db/userDB';
+import { User } from '@vue-skuilder/db';
 import { getCurrentUser } from '@/stores/useAuthStore';
 
 const user = ref<User | null>(null);
diff --git a/packages/vue/src/components/UserLogin.vue b/packages/vue/src/components/UserLogin.vue
@@ -49,7 +49,7 @@ import { useRouter, useRoute } from 'vue-router';
 import { alertUser } from '@/components/SnackbarService.vue';
 import { log } from '@/logshim';
 import { Status } from '@vue-skuilder/common';
-import { User } from '@/db/userDB';
+import { User } from '@vue-skuilder/db';
 import { getCurrentUser, useAuthStore } from '@/stores/useAuthStore';
 import { useConfigStore } from '@/stores/useConfigStore';
 
diff --git a/packages/vue/src/components/UserLoginAndRegistrationContainer.vue b/packages/vue/src/components/UserLoginAndRegistrationContainer.vue
@@ -25,7 +25,7 @@ import UserLogin from './UserLogin.vue';
 import UserRegistration from './UserRegistration.vue';
 import UserChip from './UserChip.vue';
 import { useAuthStore } from '@/stores/useAuthStore';
-import { GuestUsername } from '@/constants';
+import { GuestUsername } from '@vue-skuilder/db';
 
 const route = useRoute();
 const authStore = useAuthStore();
diff --git a/packages/vue/src/components/UserRegistration.vue b/packages/vue/src/components/UserRegistration.vue
@@ -62,7 +62,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { User } from '@/db/userDB';
+import { User } from '@vue-skuilder/db';
 import { log } from '@/logshim';
 import { alertUser } from './SnackbarService.vue';
 import { Status } from '@vue-skuilder/common';
diff --git a/packages/vue/src/courses/NameSpacer.ts b/packages/vue/src/courses/NameSpacer.ts
@@ -1,5 +1,7 @@
 // tslint:disable-next-line:max-classes-per-file
 
+// [ ] delete this file - duplicated in `common` package
+
 export class NameSpacer {
   public static getDataShapeDescriptor(shapeStr: string): ShapeDescriptor {
     const splitArray = shapeStr.split('.');
diff --git a/packages/vue/src/courses/piano/utility/MidiConfig.vue b/packages/vue/src/courses/piano/utility/MidiConfig.vue
@@ -81,7 +81,7 @@ import { defineComponent, ref, watch, onMounted } from 'vue';
 import { alertUser } from '@/components/SnackbarService.vue';
 import SkMidi from './midi';
 import { Status } from '@vue-skuilder/common';
-import { User } from '@/db/userDB';
+import { User } from '@vue-skuilder/db';
 import { InputEventNoteon } from 'webmidi';
 import { getCurrentUser } from '@/stores/useAuthStore';
 import PianoRangeVisualizer from './PianoRangeVisualizer.vue';
diff --git a/packages/vue/src/db/SessionController.ts b/packages/vue/src/db/SessionController.ts
@@ -7,10 +7,11 @@ import {
   StudySessionItem,
   StudySessionNewItem,
   StudySessionReviewItem,
-} from './contentSource';
-import { Loggable } from './Loggable';
-import { CardRecord } from './types';
-import { ScheduledCard, User } from './userDB';
+  Loggable,
+  CardRecord,
+  ScheduledCard,
+  User,
+} from '@vue-skuilder/db';
 
 export interface StudySessionRecord {
   card: {
diff --git a/packages/vue/src/store.mock.ts b/packages/vue/src/store.mock.ts
@@ -5,7 +5,7 @@
 // import { ViewData } from '@/base-course/Interfaces/ViewData';
 // import { CourseConfig } from '@/server/types';
 // import { FieldInputInstance } from '@/components/Edit/ViewableDataInputForm/FieldInput.types';
-// import { User } from '@/db/userDB';
+// import { User } from '@vue-skuilder/db';
 
 // export const GuestUsername: string = 'Guest';
 
diff --git a/packages/vue/src/stores/useAuthStore.ts b/packages/vue/src/stores/useAuthStore.ts
@@ -1,8 +1,7 @@
 // stores/useAuthStore.ts
 import { defineStore } from 'pinia';
-import { User } from '@vue-skuilder/db';
+import { User, GuestUsername } from '@vue-skuilder/db';
 import { ENV } from '@vue-skuilder/common';
-import { GuestUsername } from '@/constants';
 
 interface AuthState {
   _user?: User;
diff --git a/packages/vue/src/stores/useDataInputFormStore.ts b/packages/vue/src/stores/useDataInputFormStore.ts
@@ -18,7 +18,7 @@ interface DataInputForm {
   uploading: boolean;
 }
 
-interface DataInputFormState {
+export interface DataInputFormState {
   dataInputForm: DataInputForm;
 }
 
diff --git a/packages/vue/src/views/Admin.vue b/packages/vue/src/views/Admin.vue
@@ -62,8 +62,8 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import AdminDB from '../db/adminDB';
-import { GuestUsername } from '@/constants';
+import { AdminDB } from '@vue-skuilder/db';
+import { GuestUsername } from '@vue-skuilder/db';
 interface User {
   _id: string;
   name: string;
diff --git a/packages/vue/src/views/Classrooms.vue b/packages/vue/src/views/Classrooms.vue
@@ -96,14 +96,17 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
+import { Status, ServerRequestType, JoinClassroom, LeaveClassroom, DeleteClassroom } from '@vue-skuilder/common';
+import {
+  registerUserForClassroom,
+  getUserClassrooms,
+  dropUserFromClassroom,
+  getClassroomConfig,
+  User,
+} from '@vue-skuilder/db';
 import serverRequest from '@/server/index';
-import { ServerRequestType, JoinClassroom, LeaveClassroom, DeleteClassroom } from '@vue-skuilder/common';
 import { alertUser } from '@/components/SnackbarService.vue';
-import { Status } from '@vue-skuilder/common';
 import ClassroomEditor from '@/components/Classrooms/CreateClassroom.vue';
-import { registerUserForClassroom, getUserClassrooms, dropUserFromClassroom } from '../db/userDB';
-import { getClassroomConfig } from '../db/classroomDB';
-import { User } from '../db/userDB';
 import { getCurrentUser } from '@/stores/useAuthStore';
 
 interface CourseReg {
diff --git a/packages/vue/src/views/Courses.vue b/packages/vue/src/views/Courses.vue
@@ -81,8 +81,7 @@ import _ from 'lodash';
 import serverRequest from '../server';
 import { ServerRequestType, CourseConfig } from '@vue-skuilder/common';
 import { alertUser } from '../components/SnackbarService.vue';
-import { getCourseList } from '@/db/courseDB';
-import { User } from '../db/userDB';
+import { getCourseList, User } from '@vue-skuilder/db';
 import { getCurrentUser } from '@/stores/useAuthStore';
 
 type DBCourseConfig = CourseConfig & PouchDB.Core.IdMeta;
diff --git a/packages/vue/src/views/Study.vue b/packages/vue/src/views/Study.vue
diff --git a/packages/vue/src/views/User.vue b/packages/vue/src/views/User.vue
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	+// [ ] remove this file - duplicated in `common` package
	`2`	`+`
`1`	`3`	`import { FieldDefinition } from '../../base-course/Interfaces/FieldDefinition';`
`2`	`4`	`import { DataShapeName } from '../../enums/DataShapeNames';`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { DisplayableData } from '../../db/types';`
	`1`	`+import { DisplayableData } from '@vue-skuilder/db';`
`2`	`2`
`3`	`3`	`export interface ViewData {`
`4`	`4`	`[index: string]: string \| number \| Blob \| boolean;`