Skip to content

Commit

Permalink
deleted bg container on create page for better designing patch
Browse files Browse the repository at this point in the history
  • Loading branch information
@mattiscauwel
mattiscauwel committed May 20, 2024
1 parent 850b2c0 commit 1d15183
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 61 deletions.
2 changes: 1 addition & 1 deletion frontend/src/components/subject/createSubjectView/body/SubjectInstructorsCard.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ defineEmits<{

<style scoped>
.title-card {
background-color: white;
background-color: var(--color-secondary);
padding: 20px;
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/subject/createSubjectView/body/UserSearchCard.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ defineEmits<{

<style scoped>
.title-card {
background-color: white;
background-color: var(--color-secondary);
padding: 20px;
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/subject/createSubjectView/header/CreateSubjectHeaderCard.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ watch(checkbox, (newValue) => {

<style scoped>
.title-card {
background-color: white;
background-color: var(--color-secondary);
padding: 20px;
}
Expand Down
112 changes: 54 additions & 58 deletions frontend/src/views/subject/CreateSubjectView.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,65 +3,62 @@
<p>{{ $t("default.something-went-wrong") }}</p>
</div>

<v-skeleton-loader v-else :loading="isLoading" type="card">
<v-snackbar v-model="snackbar" :timeout="3500" color="error" top>
{{ $t("create_subject.error_snackbar") }}
</v-snackbar>

<v-dialog v-model="dialog" max-width="290" persistent>
<v-card>
<v-card-title class="headline">
{{ $t("create_subject.cancel_dialog") }}
</v-card-title>
<v-card-actions>
<v-spacer></v-spacer>
<v-btn color="blue darken-1" @click="dialog = false">
{{ $t("default.no_capital") }}
<v-row v-else>
<v-col cols="1">
<v-btn variant="elevated" class="back-button" size="large" @click="dialog = true">
<v-icon>mdi-arrow-left</v-icon>
</v-btn>
</v-col>
<v-col cols="11">
<v-skeleton-loader :loading="isLoading" type="card" class="ma-8">
<v-snackbar v-model="snackbar" :timeout="3500" color="error" top>
{{ $t("create_subject.error_snackbar") }}
</v-snackbar>

<v-dialog v-model="dialog" max-width="290" persistent>
<v-card>
<v-card-title class="headline">
{{ $t("create_subject.cancel_dialog") }}
</v-card-title>
<v-card-actions>
<v-spacer></v-spacer>
<v-btn color="blue darken-1" @click="dialog = false">
{{ $t("default.no_capital") }}
</v-btn>
<v-btn color="blue darken-1" @click="router.push({ name: 'subjects' })">
{{ $t("default.yes_capital") }}
</v-btn>
</v-card-actions>
</v-card>
</v-dialog>
<CreateSubjectHeaderContainer
:image-path="`https://www.ugent.be/img/dcom/faciliteiten/ufo-logo.png`"
:current-user-as-instructor="currentUserAsInstructor"
:is-form-error="isFormError"
@update:subject-name="onSubjectNameUpdated"
@update:active-academic-year="activeAcademicYear = $event"
@update:current-user-as-instructor="currentUserAsInstructor = $event"
>
</CreateSubjectHeaderContainer>
<CreateSubjectBody
:current-user="currentUser"
:instructors="shownInstructors"
@add-instructor="addInstructor"
@remove-instructor="removeInstructor"
>
</CreateSubjectBody>

<div class="confirm-btn-container">
<v-btn class="ma-2" color="grey" @click="dialog = true">
{{ $t("default.cancel") }}
</v-btn>
<v-btn color="blue darken-1" @click="router.push({ name: 'subjects' })">
{{ $t("default.yes_capital") }}
<v-btn class="ma-2" @click="handleSubmit" color="primary" type="submit">
{{ $t("default.confirm") }}
</v-btn>
</v-card-actions>
</v-card>
</v-dialog>

<v-row>
<v-col cols="1">
<v-btn variant="elevated" class="back-button" size="large" @click="dialog = true">
<v-icon>mdi-arrow-left</v-icon>
</v-btn>
</v-col>
<v-col cols="11">
<background-container>
<CreateSubjectHeaderContainer
:image-path="`https://www.ugent.be/img/dcom/faciliteiten/ufo-logo.png`"
:current-user-as-instructor="currentUserAsInstructor"
:is-form-error="isFormError"
@update:subject-name="onSubjectNameUpdated"
@update:active-academic-year="activeAcademicYear = $event"
@update:current-user-as-instructor="currentUserAsInstructor = $event"
>
</CreateSubjectHeaderContainer>
<CreateSubjectBody
:current-user="currentUser"
:instructors="shownInstructors"
@add-instructor="addInstructor"
@remove-instructor="removeInstructor"
>
</CreateSubjectBody>

<div class="confirm-btn-container">
<v-btn class="ma-2" color="grey" @click="dialog = true">
{{ $t("default.cancel") }}
</v-btn>
<v-btn class="ma-2" @click="handleSubmit" color="primary" type="submit">
{{ $t("default.confirm") }}
</v-btn>
</div>
</background-container>
</v-col>
</v-row>
</v-skeleton-loader>
</div>
</v-skeleton-loader>
</v-col>
</v-row>
</template>

<script setup lang="ts">
Expand All @@ -71,7 +68,6 @@ import { useCreateSubjectInstructorMutation, useCreateSubjectMutation } from "@/
import type SubjectForm from "@/models/Subject";
import type User from "@/models/User";
import { useCurrentUserQuery } from "@/queries/User";
import BackgroundContainer from "@/components/BackgroundContainer.vue";
import CreateSubjectHeaderContainer from "@/components/subject/createSubjectView/header/CreateSubjectHeaderContainer.vue";
import CreateSubjectBody from "@/components/subject/createSubjectView/body/CreateSubjectBody.vue";
import { useRouter } from "vue-router";
Expand Down

0 comments on commit 1d15183

Please sign in to comment.