Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions packages/common-ui/src/components/StudySession.vue
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
<template>
<div v-if="sessionPrepared" class="StudySession">
<v-row align="center">
<v-col>
<h1 class="text-h3">
{{ courseNames[courseID] }}:
<v-progress-circular v-if="loading" color="primary" indeterminate size="32" width="4" />
</h1>
<v-spacer></v-spacer>
</v-col>
<h1 class="text-h3" v-if="courseNames[courseID]">{{ courseNames[courseID] }}:</h1>
<v-spacer></v-spacer>
<v-progress-circular v-if="loading" color="primary" indeterminate size="32" width="4" />
</v-row>

<br />
Expand Down
10 changes: 8 additions & 2 deletions packages/db/src/core/types/user.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,19 @@ export interface ScheduledCard {
*
* (Should probably be UTC adjusted so that performance is
* not wonky across time zones)
*
* Note: Stored as ISO string for PouchDB serialization compatibility,
* but can be consumed as Moment objects via moment.utc(reviewTime)
*/
reviewTime: Moment;
reviewTime: string | Moment;

/**
* The time at which this scheduled event was created.
*
* Note: Stored as ISO string for PouchDB serialization compatibility,
* but can be consumed as Moment objects via moment.utc(scheduledAt)
*/
scheduledAt: Moment;
scheduledAt: string | Moment;

/**
* Classifying whether this card is scheduled on behalf of a
Expand Down
4 changes: 2 additions & 2 deletions packages/db/src/impl/common/BaseUserDB.ts
Original file line number Diff line number Diff line change
Expand Up @@ -964,10 +964,10 @@ Currently logged-in as ${this._username}.`
scheduledFor: ScheduledCard['scheduledFor'];
schedulingAgentId: ScheduledCard['schedulingAgentId'];
}) {
return scheduleCardReviewLocal(this.remoteDB, review);
return scheduleCardReviewLocal(this.writeDB, review);
}
public async removeScheduledCardReview(reviewId: string): Promise<void> {
return removeScheduledCardReviewLocal(this.remoteDB, reviewId);
return removeScheduledCardReviewLocal(this.writeDB, reviewId);
}

public async registerForClassroom(
Expand Down
4 changes: 2 additions & 2 deletions packages/db/src/impl/common/userDBHelpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@ export function scheduleCardReviewLocal(
void userDB.put<ScheduledCard>({
_id: DocTypePrefixes[DocType.SCHEDULED_CARD] + review.time.format(REVIEW_TIME_FORMAT),
cardId: review.card_id,
reviewTime: review.time,
reviewTime: review.time.toISOString(),
courseId: review.course_id,
scheduledAt: now,
scheduledAt: now.toISOString(),
scheduledFor: review.scheduledFor,
schedulingAgentId: review.schedulingAgentId,
});
Expand Down
4 changes: 2 additions & 2 deletions packages/db/src/impl/couch/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,9 @@ export function scheduleCardReview(review: {
void getCouchUserDB(review.user).put<ScheduledCard>({
_id: DocTypePrefixes[DocType.SCHEDULED_CARD] + review.time.format(REVIEW_TIME_FORMAT),
cardId: review.card_id,
reviewTime: review.time,
reviewTime: review.time.toISOString(),
courseId: review.course_id,
scheduledAt: now,
scheduledAt: now.toISOString(),
scheduledFor: review.scheduledFor,
schedulingAgentId: review.schedulingAgentId,
});
Expand Down
25 changes: 24 additions & 1 deletion packages/standalone-ui/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import * as directives from 'vuetify/directives';
import { aliases, mdi } from 'vuetify/iconsets/mdi';

// data layer
import { initializeDataLayer } from '@vue-skuilder/db';
import { initializeDataLayer, getDataLayer } from '@vue-skuilder/db';

// auth store
import { useAuthStore } from '@vue-skuilder/common-ui';
Expand Down Expand Up @@ -163,5 +163,28 @@ import config from '../skuilder.config.json';

await useAuthStore().init();

// Auto-register user for the course in standalone mode
if (config.course) {
try {
const authStore = useAuthStore();
const user = getDataLayer().getUserDB();

// Check if user is already registered for the course
const courseRegistrations = await user.getCourseRegistrationsDoc();
const isRegistered = courseRegistrations.courses.some(c => c.courseID === config.course);

if (!isRegistered) {
console.log(`[Standalone] Auto-registering user for course: ${config.course}`);
await user.registerForCourse(config.course, false); // non-preview mode
console.log(`[Standalone] Auto-registration completed for course: ${config.course}`);
} else {
console.log(`[Standalone] User already registered for course: ${config.course}`);
}
} catch (error) {
console.warn(`[Standalone] Failed to auto-register for course ${config.course}:`, error);
// Don't block app startup on registration failure
}
}

app.mount('#app');
})();
2 changes: 0 additions & 2 deletions packages/standalone-ui/src/views/StudyView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
<v-container>
<v-row>
<v-col cols="12">
<h1 class="text-h4 mb-4">Study Session</h1>

<div v-if="sessionPrepared">
<StudySession
:content-sources="sessionContentSources"
Expand Down
4 changes: 2 additions & 2 deletions packages/standalone-ui/src/views/UserStatsView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ onMounted(async () => {
const courseDB = dataLayer.getCourseDB(courseId);

// Try to get user's ELO profile for this course
const userRegistrations = await dataLayer.getUserDB(user.getUsername()).getCourseRegistrations();
const courseReg = userRegistrations.find(reg => reg.courseID === courseId);
const userDB = dataLayer.getUserDB();
const courseReg = await userDB.getCourseRegDoc(courseId);

if (courseReg && courseReg.elo) {
userElo.value = courseReg.elo;
Expand Down
Loading