Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Subjects #169

Merged
merged 73 commits into from
May 18, 2024
Merged
Show file tree
Hide file tree
Changes from 69 commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
a3caff3
fixed some skeleton loaders and grid layout
mattiscauwel Apr 29, 2024
3269564
fixed scrolling
mattiscauwel Apr 29, 2024
a2b6c92
changed color of project card and fixed title router link
mattiscauwel Apr 29, 2024
56b45a7
fixed tab scrolling
mattiscauwel Apr 29, 2024
f3694c5
bug fix v-tabs fixed
mattiscauwel Apr 29, 2024
662398a
reverted css button styling removed
mattiscauwel Apr 30, 2024
7086dbb
fixed router link signature
mattiscauwel Apr 30, 2024
2d40e89
added isTeacher hook in header
mattiscauwel Apr 30, 2024
36e0f66
Merge remote-tracking branch 'origin/dev' into subjects
mattiscauwel Apr 30, 2024
1fa75f2
added basic buttons to view pages
mattiscauwel Apr 30, 2024
c012631
router link to create project
mattiscauwel May 1, 2024
380fe88
fetched subject_uuid
mattiscauwel May 1, 2024
bdad1b1
added snackbar for register link
mattiscauwel May 1, 2024
d8c34ce
generated academic years
mattiscauwel May 1, 2024
310f744
buttons now dynamic on academic years
mattiscauwel May 1, 2024
fbca96a
fixed academic years period
mattiscauwel May 1, 2024
d3a9b7c
only subjects showing up right academic year
mattiscauwel May 1, 2024
d1780de
error fix filter changed
mattiscauwel May 1, 2024
dd5adb6
implemented register link button
mattiscauwel May 1, 2024
94fb425
added i18n
mattiscauwel May 1, 2024
394abc3
linting
mattiscauwel May 1, 2024
24fe18c
Merge remote-tracking branch 'origin/dev' into subjects
mattiscauwel May 1, 2024
61c2baf
run formating
mattiscauwel May 1, 2024
35fd470
Update frontend/src/views/subject/SubjectView.vue
mattiscauwel May 7, 2024
05e41da
Update frontend/src/views/subject/SubjectsView.vue
mattiscauwel May 7, 2024
aa79bea
Update frontend/src/views/subject/SubjectsView.vue
mattiscauwel May 7, 2024
7b9d9be
Update frontend/src/components/subject/body/projects/SubjectProjectsP…
mattiscauwel May 7, 2024
ce3fdac
Merge remote-tracking branch 'origin/dev' into subjects
mattiscauwel May 14, 2024
5139deb
is teacher for new subject button visibility
mattiscauwel May 14, 2024
85f1fd4
buttons now only appearing when isTeacher/isInstructor
mattiscauwel May 14, 2024
f202e37
deleted announcements
mattiscauwel May 14, 2024
ba56e7a
removed intern skeleton loaders
mattiscauwel May 14, 2024
642da2e
fixed pylint docker
mattiscauwel May 14, 2024
7876d5d
found another skeleton loader
mattiscauwel May 14, 2024
a2e1773
refactored components structure and added icons for student/teacher s…
mattiscauwel May 15, 2024
34547eb
made subjecticon component
mattiscauwel May 15, 2024
f86b7eb
deleted non used css class
mattiscauwel May 15, 2024
a499dfc
Merge remote-tracking branch 'origin/dev' into subjects
mattiscauwel May 16, 2024
d2fe9fd
deleted tooltip + last refactoring before pull request
mattiscauwel May 16, 2024
0ec895e
npm run format
mattiscauwel May 16, 2024
6ba4abd
refactored utils.py
mattiscauwel May 16, 2024
8be06ae
refactored utils.py 2
mattiscauwel May 16, 2024
a091556
Merge remote-tracking branch 'origin/dev' into subjects
mattiscauwel May 16, 2024
ce9d154
solved merge conflicts
mattiscauwel May 16, 2024
441af9a
fixed i18n
mattiscauwel May 16, 2024
6c1028a
run formater, linter
mattiscauwel May 16, 2024
fe2e99b
refactored subject list into object with role
mattiscauwel May 16, 2024
1a5d3df
changing icon on subjects page (ugly solution bug with enums)
mattiscauwel May 16, 2024
a553cae
working on showing icon on subject page
mattiscauwel May 16, 2024
4f9ca8e
fixed subject uuid query + user
mattiscauwel May 16, 2024
4b1e183
Merge branch 'subjects' into subject_instructor_student_filter
mattiscauwel May 16, 2024
1cf0bf1
linter + reformat
mattiscauwel May 16, 2024
cd5f3b8
register link button permissions
mattiscauwel May 17, 2024
f7a465a
removed deleted import
mattiscauwel May 17, 2024
994e46a
fixed id icons
mattiscauwel May 17, 2024
1f1aa55
fixed subject filter buttons
mattiscauwel May 17, 2024
9b934cb
surname appears in subject header card
mattiscauwel May 17, 2024
b2d9ef3
fixed some wishful filter behavior and no results
mattiscauwel May 17, 2024
1607ae0
added i18n
mattiscauwel May 17, 2024
0df4511
fixed project title styling
mattiscauwel May 17, 2024
ab6db08
added quil
mattiscauwel May 17, 2024
b208d89
fixed registerlinkbutton
mattiscauwel May 17, 2024
99d9e88
deleted radius corners
mattiscauwel May 17, 2024
8eeb57a
run linter
mattiscauwel May 17, 2024
5d54fc6
run linter
mattiscauwel May 17, 2024
79932fe
refactored utils.py
mattiscauwel May 17, 2024
4319c1f
admin symbol when not student or instructor + fix edit subject button…
mattiscauwel May 18, 2024
4ad4aea
fix student not allowed icon
mattiscauwel May 18, 2024
b8c2fd1
linter
mattiscauwel May 18, 2024
efa1969
changed emits
mattiscauwel May 18, 2024
f479b6d
implemented requested pr changes
mattiscauwel May 18, 2024
b499069
run linter formater
mattiscauwel May 18, 2024
8cc45ae
fixed academic year
mattiscauwel May 18, 2024
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
1 change: 0 additions & 1 deletion frontend/src/components/BackgroundContainer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
padding: 20px;
height: 100vh;
border: 25px solid white;
border-radius: 50px;
background-color: var(--color-secondary);
}
</style>
9 changes: 9 additions & 0 deletions frontend/src/components/buttons/HeaderSubtitleButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,19 @@ defineProps<{
</script>

<style scoped>
.not-clickable {
cursor: default;
pointer-events: none;
}

.subtitle-button {
margin-right: 10px;
}

.subtitle-button-active {
background-color: #9fb6ff;
}

.button-text {
color: #003eff;
font-weight: 1000;
Expand Down

This file was deleted.

129 changes: 0 additions & 129 deletions frontend/src/components/subject/body/projects/SubjectProjectPage.vue
masinnae marked this conversation as resolved.
Outdated
Show resolved Hide resolved
reyniersbram marked this conversation as resolved.
Outdated
Show resolved Hide resolved

This file was deleted.

26 changes: 26 additions & 0 deletions frontend/src/components/subject/extra/SubjectIcon.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<template>
<v-icon color="white" :size="size">
{{ `mdi-${userRole}` }}
</v-icon>
</template>

<script setup lang="ts">
import { SubjectRole } from "@/models/Subject";
import { computed, toRefs } from "vue";

const props = defineProps<{
role: SubjectRole;
size: string;
}>();

const { role } = toRefs(props);

const userRole = computed(() => {
if (role.value === SubjectRole.Instructor) return "account-tie";
if (role.value === SubjectRole.Student) return "school";
if (role.value === SubjectRole.Admin) return "security";
return "cancel";
});
</script>

<style scoped></style>
63 changes: 0 additions & 63 deletions frontend/src/components/subject/header/SubjectHeaderCard.vue
masinnae marked this conversation as resolved.
Outdated
Show resolved Hide resolved

This file was deleted.

33 changes: 0 additions & 33 deletions frontend/src/components/subject/header/SubjectHeaderContainer.vue

This file was deleted.

19 changes: 0 additions & 19 deletions frontend/src/components/subject/header/SubjectHeaderImage.vue

This file was deleted.

49 changes: 49 additions & 0 deletions frontend/src/components/subject/subjectsview/SubjectCard.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<template>
<router-link :to="{ name: 'subject', params: { subjectId: subject.id } }" class="router-link">
<v-card class="subject-card" height="16vh" color="#1D357EFF">
<SubjectIcon :role="role" size="xx-large" class="subject-icon"></SubjectIcon>
<v-card-title class="subject-title">
{{ subject?.name }}
<v-icon class="">mdi-chevron-right</v-icon>
</v-card-title>
</v-card>
</router-link>
</template>

<script setup lang="ts">
import Subject, { SubjectRole } from "@/models/Subject";
reyniersbram marked this conversation as resolved.
Show resolved Hide resolved
import SubjectIcon from "@/components/subject/extra/SubjectIcon.vue";

defineProps<{
subject: Subject;
role: SubjectRole;
}>();
</script>

<style scoped>
.router-link {
text-decoration: none;
width: 100%;
}

.subject-card {
display: flex;
flex-direction: column;
justify-content: space-between;
position: relative;
width: 100%;
}

.subject-title {
color: white;
font-size: 3vh;
position: absolute;
bottom: 0;
}

.subject-icon {
position: absolute;
top: 10px;
right: 15px;
}
</style>
Loading
Loading