diff --git a/client/src/App.vue b/client/src/App.vue index 0db09cc5..954e7533 100644 --- a/client/src/App.vue +++ b/client/src/App.vue @@ -35,35 +35,19 @@ const EditContentBlockWizard = defineAsyncComponent(() => const EditRoomEntryWizard = defineAsyncComponent(() => import('@/components/rooms/room-entries/EditRoomEntryWizard.vue') ); -const NewProjectEntryWizard = defineAsyncComponent(() => - import('@/components/portfolio/NewProjectEntryWizard.vue') -); -const EditProjectEntryWizard = defineAsyncComponent(() => - import('@/components/portfolio/EditProjectEntryWizard.vue') -); -const NewObjectiveWizard = defineAsyncComponent(() => - import('@/components/objective-groups/NewObjectiveWizard.vue') -); -const NewNoteWizard = defineAsyncComponent(() => - import('@/components/notes/NewNoteWizard.vue') -); -const EditNoteWizard = defineAsyncComponent(() => - import('@/components/notes/EditNoteWizard.vue') -); -const EditClassNameWizard = defineAsyncComponent(() => - import('@/components/school-class/EditClassNameWizard.vue') -); -const EditTeamNameWizard = defineAsyncComponent(() => - import('@/components/profile/EditTeamNameWizard.vue') -); +const NewProjectEntryWizard = defineAsyncComponent(() => import('@/components/portfolio/NewProjectEntryWizard.vue')); +const EditProjectEntryWizard = defineAsyncComponent(() => import('@/components/portfolio/EditProjectEntryWizard.vue')); +const NewObjectiveWizard = defineAsyncComponent(() => import('@/components/objective-groups/NewObjectiveWizard.vue')); +const NewNoteWizard = defineAsyncComponent(() => import('@/components/notes/NewNoteWizard.vue')); +const EditNoteWizard = defineAsyncComponent(() => import('@/components/notes/EditNoteWizard.vue')); +const EditClassNameWizard = defineAsyncComponent(() => import('@/components/school-class/EditClassNameWizard.vue')); +const EditTeamNameWizard = defineAsyncComponent(() => import('@/components/profile/EditTeamNameWizard.vue')); const EditSnapshotTitleWizard = defineAsyncComponent(() => import('@/components/snapshots/EditSnapshotTitleWizard.vue') ); const DefaultLayout = defineAsyncComponent(() => import('@/layouts/DefaultLayout.vue')); const SimpleLayout = defineAsyncComponent(() => import('@/layouts/SimpleLayout.vue')); -const FullScreenLayout = defineAsyncComponent(() => - import('@/layouts/FullScreenLayout.vue') -); +const FullScreenLayout = defineAsyncComponent(() => import('@/layouts/FullScreenLayout.vue')); const PublicLayout = defineAsyncComponent(() => import('@/layouts/PublicLayout.vue')); const BlankLayout = defineAsyncComponent(() => import('@/layouts/BlankLayout.vue')); const SplitLayout = defineAsyncComponent(() => import('@/layouts/SplitLayout.vue')); diff --git a/client/src/components/page-form/PageFormInput.vue b/client/src/components/page-form/PageFormInput.vue index cc5ba8bf..5e1371bb 100644 --- a/client/src/components/page-form/PageFormInput.vue +++ b/client/src/components/page-form/PageFormInput.vue @@ -22,7 +22,7 @@ import { getUniqueId } from '@/helpers/id'; interface Props { label: string; - type: string; + type?: string; value: string; } const props = withDefaults(defineProps(), { diff --git a/client/src/components/rooms/AddRoomEntryButton.vue b/client/src/components/rooms/AddRoomEntryButton.vue index a2f981ef..aee287a8 100644 --- a/client/src/components/rooms/AddRoomEntryButton.vue +++ b/client/src/components/rooms/AddRoomEntryButton.vue @@ -16,7 +16,7 @@ const PlusIcon = defineAsyncComponent(() => import('@/components/icons/PlusIcon. const props = withDefaults( defineProps<{ - module: boolean; + module?: boolean; }>(), { module: false, diff --git a/client/src/graphql/client.js b/client/src/graphql/client.js index dba3cff0..7072e68d 100644 --- a/client/src/graphql/client.js +++ b/client/src/graphql/client.js @@ -19,10 +19,10 @@ export default function(uri, networkErrorCallback) { }); const consoleLink = new ApolloLink((operation, forward) => { - log.debug('operation', operation.operationName); + // log.debug('operation', operation.operationName); return forward(operation).map((data) => { - log.debug(`returned from server for ${operation.operationName}`, data); + // log.debug(`returned from server for ${operation.operationName}`, data); return data; }); }); @@ -43,7 +43,8 @@ export default function(uri, networkErrorCallback) { const errorLink = onError(({ networkError, graphQLErrors }) => { if (networkError && networkErrorCallback) { networkErrorCallback(networkError.statusCode); - if (networkError.statusCode == 402) { // not authenticated, we don't need to continue here + if (networkError.statusCode == 402) { + // not authenticated, we don't need to continue here return; } } diff --git a/client/src/helpers/matomo-client.ts b/client/src/helpers/matomo-client.ts index 4d97cdb9..3e25f7f6 100644 --- a/client/src/helpers/matomo-client.ts +++ b/client/src/helpers/matomo-client.ts @@ -27,7 +27,7 @@ export function matomoTrackPageView(absolutePath: string = '/', title?: string) if (matomoLastUrl !== url) { // do not track the same url twice - log.debug('trackMatomoPageView', { url, matomoLastUrl, title }); + // log.debug('trackMatomoPageView', { url, matomoLastUrl, title }); window._paq.push(['setCustomUrl', url]); window._paq.push(['trackPageView', title]); matomoLastUrl = url; @@ -39,7 +39,7 @@ export function matomoTrackEvent(category: string, action: string, name?: string const dataJSON = JSON.stringify(data); if (matomoLastEventData !== dataJSON) { - log.debug('matomoTrackEvent', { category, action, name, value }); + // log.debug('matomoTrackEvent', { category, action, name, value }); // @ts-ignore window._paq.push(['trackEvent', category, action, name, value]); matomoLastEventData = dataJSON; @@ -79,7 +79,7 @@ export function matomoTrackModuleVisibilityEvent(blockType: string, block: any, export function matomoTrackUser(userId: string, role: matomoUserRole = 'Student') { // see https://developer.matomo.org/guides/tracking-javascript-guide#user-id for the process if (matomoLastUserId !== userId) { - log.debug('matomoTrackUser', { userId, matomoLastUserId, role }); + // log.debug('matomoTrackUser', { userId, matomoLastUserId, role }); if (userId) { // @ts-ignore diff --git a/client/src/pages/module/module.vue b/client/src/pages/module/module.vue index 25d5cf21..2c4c8ae4 100644 --- a/client/src/pages/module/module.vue +++ b/client/src/pages/module/module.vue @@ -1,228 +1,233 @@