[M] Move welcome message to welcome component

This commit is contained in:
Hykilpikonna
2020-04-20 15:25:01 -04:00
parent 10d25ff091
commit ed727a7f26
4 changed files with 12 additions and 33 deletions
@@ -1,23 +1,4 @@
#info
{
margin: 20px 20px 10px;
.header
{
margin-top: 15px;
margin-bottom: 10px;
font-size: 30px;
color: #8c85ea;
}
.content
{
margin-bottom: 15px;
}
}
#course-list
{
margin-right: 20px;
@@ -3,7 +3,7 @@ import App from '@/components/app/app';
import CourseInfo, {ClassInfo, UniqueCourse} from '@/logic/course-info';
import {GPAUtils} from '@/logic/utils/gpa-utils';
// @ts-ignore
import SearchSettingsComponent, {SearchSettings} from '@/pages/course-selection/search-settings/search-settings.vue';
import SearchSettingsComponent, {SearchSettings} from '@/pages/course-selection/pages/search-settings.vue';
@Component({components: {SearchSettings: SearchSettingsComponent}})
export default class CourseSelection extends Vue
@@ -1,18 +1,5 @@
<template>
<div id="course-selection">
<el-card id="info">
<div class="header">Course Selection</div>
<div class="content" v-if="app.user.gradeLevel < 12">
This new page is designed to help you with your course selection for your
<span style="color:#409EFF">{{nextYearGradeLevel}} year</span>,
providing more information such as how many people are currently enrolled in a course.
</div>
<div class="content" style="color: #ff3d3d" v-if="app.user.gradeLevel >= 12">
You are a senior, what are you doing over here lol. <br>
Unfortunately I can't help you with college course selection.
</div>
</el-card>
<el-row>
<el-col :span="16" class="overall-span">
<el-card class="left" :style="{height: cardsHeight + 'px'}">
@@ -1,6 +1,17 @@
<template>
<div id="welcome">
<div class="header">Welcome</div>
<el-divider class="divider"><i class="el-icon-cold-drink"></i></el-divider>
<div class="content" v-if="app.user.gradeLevel < 12">
This new page is designed to help you with your course selection for your
<span style="color:#409EFF">{{nextYearGradeLevel}} year</span>,
providing more information such as how many people are currently enrolled in a course.
</div>
<div class="content" style="color: #ff3d3d" v-if="app.user.gradeLevel >= 12">
You are a senior, what are you doing over here lol. <br>
Unfortunately I can't help you with college course selection.
</div>
</div>
</template>