Skip to content

Commit

Permalink
fix: issues after merge
Browse files Browse the repository at this point in the history
  • Loading branch information
BramMeir committed Mar 31, 2024
1 parent 93709ed commit dc64dcf
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
10 changes: 8 additions & 2 deletions frontend/src/store/authentication.store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ export const useAuthStore = defineStore('auth', () => {
user.value.is_staff,
user.value.roles,
[],
courses.value ?? []
courses.value ?? [],
user.value.create_time,
user.value.last_login
);
}else if (view.value === 'student') {
await getCoursesByStudent(user.value.id);
Expand All @@ -53,6 +55,8 @@ export const useAuthStore = defineStore('auth', () => {
user.value.last_name,
user.value.is_staff,
user.value.last_enrolled,
user.value.create_time,
user.value.last_login,
user.value.id,
user.value.roles,
courses.value ?? []
Expand All @@ -70,7 +74,9 @@ export const useAuthStore = defineStore('auth', () => {
user.value.is_staff,
user.value.roles,
[],
courses.value ?? []
courses.value ?? [],
user.value.create_time,
user.value.last_login
);
}
}
Expand Down
2 changes: 0 additions & 2 deletions frontend/src/views/dashboard/DashboardView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,12 @@ import ProjectCard from "@/components/projects/ProjectCard.vue";
import {useAuthStore} from '@/store/authentication.store.ts';
import {storeToRefs} from 'pinia';
import { computed } from 'vue';
import { Course } from '@/types/Course';
/* Composable injections */
const {t} = useI18n();
/* Component state */
const allProjects = ref<Project[]>([]);
const allCourses = ref<Course[]>([]);
const academicYears = ref<{ label: string; value: number }[]>();
const selectedCoursesYear = ref<number>();
const selectedProjectsYear = ref<number>();
Expand Down

0 comments on commit dc64dcf

Please sign in to comment.