[O] Inline overall.ts

src/components/app/app.ts

@@ -1,7 +1,7 @@
 import {Component, Vue} from 'vue-property-decorator';
 import Login from '@/components/login/login';
 import Navigation from '@/components/navigation/navigation';
-import Overall from '@/pages/overall/overall';
+import Overall from '@/pages/overall/overall.vue';
 import Constants from '@/constants';
 import JsonUtils from '@/utils/json-utils';
 import pWaitFor from 'p-wait-for';

src/pages/overall/overall-course/assignment-entry/assignment-entry.vue

@@ -5,6 +5,7 @@
                 <span class="month">{{getMoment(assignment.date).format("MMM Do")}}</span>
                 <span class="now">({{getMoment(assignment.date).fromNow()}})</span>
             </el-col>
+
             <el-col :span="15" class="description">
                 <span class="type entry-box"
                       :style="`border-color: var(--assignment-type-${assignment.typeId})`">
@@ -12,6 +13,7 @@
                 </span>
                 <span class="text">{{assignment.description}}</span>
             </el-col>
+
             <el-col :span="6" class="grade">
                 <span class="percent entry-box">
                     {{(assignment.score / assignment.scoreMax * 100).toFixed(1)}}
@@ -19,6 +21,7 @@
                 </span>
                 <span class="score entry-box">{{assignment.score}}</span>
                 <span class="max entry-box">{{assignment.scoreMax}}</span>
+
                 <el-button class="mark-as-read" size="mini" type="text"
                            icon="el-icon-close" @click="markAsRead" v-if="unread">
                 </el-button>

src/pages/overall/overall.ts

@@ -1,23 +0,0 @@
-import {Component, Prop, Vue} from 'vue-property-decorator';
-import OverallLine from '@/pages/overall/overall-line/overall-line';
-import OverallBar from '@/pages/overall/overall-bar/overall-bar';
-import OverallCourse from '@/pages/overall/overall-course/overall-course';
-import {Course} from '@/components/app/app';
-import {GPAUtils} from '@/utils/gpa-utils';
-
-@Component({
-    components: {OverallLine, OverallBar, OverallCourse}
-})
-export default class Overall extends Vue
-{
-    @Prop({required: true}) courses: Course[];
-
-    /**
-     * This function is called to get gpa since I can't import another
-     * class in the Vue file.
-     */
-    public getGPA()
-    {
-        return GPAUtils.getGPA(this.courses);
-    }
-}

src/pages/overall/overall.vue

@@ -32,5 +32,30 @@
     </div>
 </template>
 
-<script src="./overall.ts" lang="ts"></script>
+<script lang="ts">
+    import {Component, Prop, Vue} from 'vue-property-decorator';
+    import OverallLine from '@/pages/overall/overall-line/overall-line';
+    import OverallBar from '@/pages/overall/overall-bar/overall-bar';
+    import OverallCourse from '@/pages/overall/overall-course/overall-course';
+    import {Course} from '@/components/app/app';
+    import {GPAUtils} from '@/utils/gpa-utils';
+
+    @Component({
+        components: {OverallLine, OverallBar, OverallCourse}
+    })
+    export default class Overall extends Vue
+    {
+        @Prop({required: true}) courses: Course[];
+
+        /**
+         * This function is called to get gpa since I can't import another
+         * class in the Vue file.
+         */
+        public getGPA()
+        {
+            return GPAUtils.getGPA(this.courses);
+        }
+    }
+</script>
+
 <style src="./overall.scss" lang="scss" scoped></style>