[+] Import course-detail page into course-selection

This commit is contained in:
Hykilpikonna
2020-04-20 16:57:41 -04:00
parent d821be41df
commit c3c9e2c175
2 changed files with 7 additions and 4 deletions
@@ -5,8 +5,9 @@ import {GPAUtils} from '@/logic/utils/gpa-utils';
// @ts-ignore // @ts-ignore
import SearchSettingsComponent, {SearchSettings} from '@/pages/course-selection/pages/search-settings.vue'; import SearchSettingsComponent, {SearchSettings} from '@/pages/course-selection/pages/search-settings.vue';
import Welcome from '@/pages/course-selection/pages/welcome.vue'; import Welcome from '@/pages/course-selection/pages/welcome.vue';
import CourseDetail from '@/pages/course-selection/pages/course-detail.vue';
@Component({components: {SearchSettings: SearchSettingsComponent, Welcome}}) @Component({components: {SearchSettings: SearchSettingsComponent, Welcome, CourseDetail}})
export default class CourseSelection extends Vue export default class CourseSelection extends Vue
{ {
@Prop({required: true}) app: App @Prop({required: true}) app: App
@@ -23,6 +24,7 @@ export default class CourseSelection extends Vue
openedPage: string = ''; openedPage: string = '';
settings: SearchSettings = new SearchSettings(); settings: SearchSettings = new SearchSettings();
activeCourseIndex: number = -1;
/** /**
* Called before rendering * Called before rendering
@@ -3,8 +3,9 @@
<el-row> <el-row>
<el-col :span="16" class="overall-span"> <el-col :span="16" class="overall-span">
<el-card class="left" :style="{height: cardsHeight + 'px'}"> <el-card class="left" :style="{height: cardsHeight + 'px'}">
<SearchSettings ref="settings" :settings="settings" v-if="openedPage === 'settings'"></SearchSettings> <SearchSettings v-if="openedPage === 'settings'" ref="settings" :settings="settings"/>
<Welcome :app="app" v-if="openedPage === ''"></Welcome> <Welcome v-if="openedPage === ''" :app="app"/>
<CourseDetail v-if="openedPage === 'course'" :course-info="courseInfo[activeCourseIndex]"/>
</el-card> </el-card>
</el-col> </el-col>
@@ -16,7 +17,7 @@
<!-- Search --> <!-- Search -->
<el-input class="search" placeholder="Search..." prefix-icon="el-icon-search" v-model="search"> <el-input class="search" placeholder="Search..." prefix-icon="el-icon-search" v-model="search">
<el-button slot="append" icon="el-icon-s-tools" @click="openSettings"></el-button> <el-button slot="append" icon="el-icon-s-tools" @click="openSettings"/>
</el-input> </el-input>
</div> </div>