[U] Release v0.5.4.1391

[F] Only average graded assignments in type average
[S] Reverse alternating shading order
2020-03-07 16:55:27 -05:00 · 2020-03-07 16:15:59 -05:00 · 2020-03-07 16:13:03 -05:00 · 2020-03-07 16:12:24 -05:00 · 2020-03-07 16:12:02 -05:00 · 2020-03-07 16:11:35 -05:00
70 changed files with 6168 additions and 3750 deletions
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash

+#echo "Switch to production database settings"
+#exit
+
 # abort on errors
 set -e

@@ -8,24 +8,28 @@
    "lint": "vue-cli-service lint"
  },
  "dependencies": {
-    "core-js": "^2.6.5",
-    "echarts": "^4.2.1",
-    "element-ui": "^2.11.1",
+    "@types/chroma-js": "^1.4.3",
+    "@types/md5": "^2.1.33",
+    "chroma-js": "^2.1.0",
+    "core-js": "^2.6.10",
+    "echarts": "^4.5.0",
+    "element-ui": "^2.13.0",
+    "md5": "^2.2.1",
    "moment": "^2.24.0",
    "p-wait-for": "^3.1.0",
    "v-charts": "^1.19.0",
    "vue": "^2.6.10",
    "vue-class-component": "^7.0.2",
    "vue-cookies": "^1.5.13",
-    "vue-property-decorator": "^8.1.0"
+    "vue-property-decorator": "^8.3.0"
  },
  "devDependencies": {
-    "@vue/cli-plugin-babel": "^3.10.0",
-    "@vue/cli-plugin-typescript": "^3.10.0",
-    "@vue/cli-service": "^3.10.0",
-    "node-sass": "^4.9.0",
-    "sass-loader": "^7.1.0",
-    "typescript": "^3.4.3",
+    "@vue/cli-plugin-babel": "^3.12.1",
+    "@vue/cli-plugin-typescript": "^3.12.1",
+    "@vue/cli-service": "^4.1.1",
+    "node-sass": "^4.13.0",
+    "sass-loader": "^7.3.1",
+    "typescript": "^3.7.3",
    "vue-template-compiler": "^2.6.10"
  },
  "postcss": {
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>404: Redirecting...</title>
+    <meta http-equiv = "refresh" content = "0; url = https://vera.hydev.org/" />
+</head>
+<body>
+    404 Not Found! Redirecting to (<a href="https://vera.hydev.org">https://vera.hydev.org</a>)...
+    <script>
+        window.location.href = 'https://vera.hydev.org';
+    </script>
+</body>
+</html>
@@ -3,9 +3,10 @@
    <head>
        <meta charset="utf-8">
        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <meta name="viewport" content="width=device-width,initial-scale=1.0">
+        <!--meta name="viewport" content="width=device-width,initial-scale=1.0"-->
+        <meta name="viewport" content="width=1024">

-        <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+        <link rel="icon" href="<%= BASE_URL %>logo@32px.png">
        <title>Veracross Analyzer</title>
    </head>

@@ -23,7 +24,9 @@

        <!-- ElementUI -->
        <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
-        <script src="https://unpkg.com/element-ui/lib/index.js"></script>
+
+        <!-- Fonts -->
+        <link href="https://fonts.googleapis.com/css?family=Nunito+Sans&display=swap" rel="stylesheet">
    </body>

    <!-- Global site tag (gtag.js) - Google Analytics -->
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Redirecting...</title>
+    <meta http-equiv = "refresh" content = "0; url = https://vera.hydev.org/#info" />
+</head>
+<body>
+Redirecting to (<a href="https://vera.hydev.org/#info">https://vera.hydev.org/#info</a>)...
+<script>
+    window.location.href = 'https://vera.hydev.org/#info';
+</script>
+</body>
+</html>
@@ -5,6 +5,7 @@
    -moz-osx-font-smoothing: grayscale;
    text-align: center;
    color: #2c3e50;
+    padding-bottom: 100px;
 }

 #app-content
@@ -24,7 +25,58 @@
    --assignment-type-3: #ff9900;
    --assignment-type-4: #b02b02;

-    --font: 'Avenir', Helvetica, Arial, sans-serif;
+    //--font: 'Avenir', Helvetica, Arial, sans-serif;
+    --font: -apple-system, Nunito Sans, Avenir, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen,
+    Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue,
+    Hiragino Sans GB, Microsoft YaHei, WenQuanYi Micro Hei, Helvetica, Arial, sans-serif;
+}
+
+.dark
+{
+    --dark-layer-1: #383838;
+    --dark-layer-2: #525252;
+    --dark-layer-3: #6c6c6c;
+    --dark-foreground: #e9e9e9;
+
+    background: var(--dark-layer-1) !important;
+
+    div, ul
+    {
+        background: var(--dark-layer-2) !important;
+        color: var(--dark-foreground) !important;
+    }
+
+    span, button
+    {
+        color: var(--dark-foreground) !important;
+    }
+
+    .el-card
+    {
+        border: none !important;
+    }
+
+    // Overall
+    #app-inner, #overall, #overall-course, .overall-span, #app-content
+    {
+        background: var(--dark-layer-1) !important;
+    }
+
+    // Course card
+    .entry-box, .none .unread-number {background: #797979 !important}
+    .entry-box.max {background-color: #949494 !important}
+    .entry-box.percent {background-color: #a7a490 !important}
+    .course-name {color: #cffff6 !important}
+    #block-grade #updates.none #unread-number {background: #757575 !important}
+
+    .course-card-content.expand, .assignment-entry, .unread-row,
+    .unread-row .el-col, #assignment-type-head, .course-page-graph.el-col
+    {
+        background-color: var(--dark-layer-3) !important;
+    }
+
+    // Nav bar
+    .el-menu--horizontal>.el-menu-item.is-active {color: var(--dark-foreground) !important;}
 }

 // ##############
@@ -82,3 +134,14 @@ div.el-card.course-card > div.el-card__body
    -ms-user-select: none;
    user-select: none;
 }
+
+.el-dropdown-menu__item
+{
+    font-family: Nunito Sans, Helvetica Neue, Microsoft YaHei, "微软雅黑", Arial, sans-serif;
+}
+
+// Fix word breaking
+.el-dialog__body
+{
+    word-break: unset !important;
+}
@@ -1,117 +1,83 @@
 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';
-import {HttpUtils} from '@/utils/http-utils';
-import {CourseUtils} from '@/utils/course-utils';
-import {GPAUtils} from '@/utils/gpa-utils';
-import Loading from '@/components/loading/loading.vue';
-import CoursePage from '@/pages/course/course-page';
-
-
-/**
- * Objects of this interface represent assignment grades.
- */
-export interface Assignment
-{
-    id: number,
-    scoreId: number,
-    type: string,
-    typeId: number,
-    description: string,
-    date: string,
-    complete: string,
-    include: boolean,
-    display: boolean,
-
-    unread: boolean,
-
-    scoreMax: number,
-    score: number
-}
-
-/**
- * A course
- */
-export interface Course
-{
-    assignmentsId: number,
-    id: number,
-    name: string,
-    teacherName: string,
-    status: string,
-
-    letterGrade?: string,
-    numericGrade?: number,
-
-    level: string,
-    scaleUp: number,
-
-    grading:
-    {
-        method: string,
-        weightingMap: {[index: string]: number}
-    }
-
-    assignments: Assignment[]
-}
+import {HttpUtils} from '@/logic/utils/http-utils';
+import Loading from '@/components/overlays/loading.vue';
+import CoursePage from '@/pages/course/course-page.vue';
+import Course from '@/logic/course';
+import LoginUser from '@/logic/login-user';
+import NavController from '@/logic/nav-controller';
+import Info from '@/statics/Info.vue';

@Component({
-    components: {Login, Navigation, Overall, Loading, CoursePage},
+    components: {Login, Navigation, Overall, Loading, CoursePage, Info},
 })
 export default class App extends Vue
 {
    // Is the login panel shown
-    public showLogin: boolean = true;
+    showLogin: boolean = true;

    // List of course that the student takes
-    public courses: Course[] = [];
-
-    // List of course that should be displayed
-    public filteredCourses: Course[] = [];
-
-    // Currently selected tab
-    public selectedTab: string = 'overall';
+    courses: Course[] = [];
+    gradedCourses: Course[] = [];

    // Are the course assignments loaded from the server.
-    public assignmentsReady: boolean = false;
+    assignmentsReady: boolean = false;

    // Token
-    public token: string = '';
+    user: LoginUser = null as any;

    // Loading text
-    public loading: string = '';
+    loading: string = '';

    // Loading error
-    public loadingError: boolean = false;
+    loadingError: boolean = false;
+
+    // Navigation controller
+    nav: NavController = new NavController();

    // Http Client
-    public static http: HttpUtils = new HttpUtils();
+    static http: HttpUtils = new HttpUtils();

    // Instance
-    public static instance: App;
+    static instance: App;
+
+    // Static page
+    staticPage: string = '';
+
+    // Dark mode
+    darkMode: boolean = false;

    /**
     * This is called when the instance is created.
     */
-    public created()
+    created()
    {
        // Show splash
        console.log(Constants.SPLASH);

        // Update instance
        App.instance = this;
+
+        // Check location
+        if (window.location.hash == '#info')
+        {
+            this.staticPage = 'info';
+        }
+
+        // Dark mode
+        this.darkMode = this.$cookies.isKey('dark');
    }

    /**
     * This is called when the user logs in.
     *
-     * @param token Authorization token
+     * @param user Authorization user
     */
-    public onLogin(token: string)
+    onLogin(user: LoginUser)
    {
        // Hide login bar
        this.showLogin = false;
@@ -119,20 +85,20 @@ export default class App extends Vue
        // Show loading message
        this.logLoading('1. Logging in...');

-        // Store token
-        this.token = token;
+        // Store user
+        this.user = user;

-        // Assign token to http client
-        App.http.token = token;
+        // Assign user to http client
+        App.http.user = user;

        // Load data
        this.loadCoursesAfterLogin();
    }

    /**
-     * Load courses data after login.
+     * Load courses data after logging in.
     */
-    public loadCoursesAfterLogin()
+    loadCoursesAfterLogin()
    {
        // Show loading message
        this.logLoading('2. Loading courses...');
@@ -144,7 +110,7 @@ export default class App extends Vue
            if (response.success)
            {
                // Save courses
-                this.courses = response.data;
+                this.courses = response.data.map((courseJson: any) => new Course(courseJson));

                // Load assignments
                this.loadAssignments();
@@ -157,7 +123,7 @@ export default class App extends Vue
    /**
     * Load the assignments of the courses
     */
-    public loadAssignments()
+    loadAssignments()
    {
        // Show loading message
        this.logLoading('3. Loading assignments...');
@@ -171,9 +137,7 @@ export default class App extends Vue
                // Check success
                if (response.success)
                {
-                    // Load assignments
-                    // Parse json and filter it
-                    course.assignments = JsonUtils.filterAssignments(response.data);
+                    course.loadAssignments(response.data);
                }
                else throw new Error(response.data);
            })
@@ -181,10 +145,10 @@ export default class App extends Vue
        });

        // Wait for assignments to be ready.
-        pWaitFor(() => this.courses.every(c => c.assignments != null)).then(() =>
+        pWaitFor(() => this.courses.every(c => c.rawAssignments != null)).then(() =>
        {
            // Filter courses
-            this.filteredCourses = CourseUtils.getGradedCourses(this.courses);
+            this.gradedCourses = this.courses.filter(c => c.isGraded);

            // Check grading algorithms
            this.checkGradingAlgorithms();
@@ -194,40 +158,50 @@ export default class App extends Vue
    /**
     * Check the courses' grading algorithms. (Total-mean or percent-type)
     */
-    private checkGradingAlgorithms()
+    checkGradingAlgorithms()
    {
        // Show loading message
        this.logLoading('4. Checking grading algorithms...');

        // Loop through all the courses
-        for (const course of this.filteredCourses)
+        for (const course of this.gradedCourses)
        {
-            // Check if total-average grade is the same with percent-type grade
-            if (course.numericGrade == +GPAUtils.getTotalMeanAverage(course).toFixed(2))
+            for (const i of [0, 1, 2, 3])
            {
-                course.grading = {method: 'TOTAL_MEAN', weightingMap: {}};
-            }
-            else
-            {
-                // Request grading scheme for this course
-                App.http.post('/grading', {'assignmentsId': course.assignmentsId}).then(response =>
+                const cookieIndex = `va.grading.${i}.${course.assignmentsId}`;
+
+                // Check if already exist in cookies
+                if (this.$cookies.isKey(cookieIndex))
+                {
+                    course.termGrading[i] = {method: 'TOTAL_MEAN', weightingMap: {}};
+                    continue;
+                }
+
+                // Request grading scheme for this course at this grading period
+                App.http.post('/grading/term', {assignmentsId: course.assignmentsId, term: i}).then(resp =>
                {
                    // Check success
-                    if (response.success)
+                    if (resp.success)
                    {
                        // Add it to course
-                        course.grading = response.data;
+                        course.termGrading[i] = resp.data;
+
+                        // If it's total_mean, cache it to cookies
+                        // This is because only percent_type can update over time
+                        if (course.termGrading[i].method == 'TOTAL_MEAN')
+                        {
+                            this.$cookies.set(cookieIndex, 'TOTAL_MEAN', 'd');
+                        }
                    }
-                    else throw new Error(response.data);
+                    else throw new Error(resp.data);
                })
                .catch(e => this.showError(`Error: Grading data failed to load.\n(${e})`))
            }
        }

        // Wait for done
-        pWaitFor(() => this.filteredCourses.every(c => c.grading != undefined)).then(() =>
+        pWaitFor(() => this.gradedCourses.every(c => c.termGrading.every(g => g != null))).then(() =>
        {
-            // When the assignments are ready
            this.assignmentsReady = true;

            // Remove loading
@@ -240,7 +214,7 @@ export default class App extends Vue
     *
     * @param message Message
     */
-    private logLoading(message: string)
+    logLoading(message: string)
    {
        if (message == '') this.loading = '';
        else this.loading += '\n' + message;
@@ -251,7 +225,7 @@ export default class App extends Vue
     *
     * @param message Error message
     */
-    private showError(message: string)
+    showError(message: string)
    {
        this.loadingError = true;
        this.loading = message;
@@ -260,7 +234,7 @@ export default class App extends Vue
    /**
     * Sign out
     */
-    public signOut()
+    signOut()
    {
        // Clear all cookies
        this.$cookies.keys().forEach(key => this.$cookies.remove(key));
@@ -268,4 +242,15 @@ export default class App extends Vue
        // Refresh
        window.location.reload();
    }
+
+    /**
+     * Select time (Eg. Term 1, Term 2, All Year, etc.)
+     *
+     * @param code
+     */
+    selectTime(code: number)
+    {
+        // TODO: Optimize
+        window.location.reload();
+    }
 }
@@ -1,23 +1,29 @@
 <template>
    <div id="app" class="theme-default">
-        <login v-if="showLogin" v-on:login:token="onLogin"></login>
-        <navigation :courses="filteredCourses"
-                    :activeIndex.sync="selectedTab"
-                    v-on:sign-out="signOut">
-        </navigation>
+        <div id="app-inner" v-if="staticPage === ''" :class="{dark: darkMode}">
+            <login v-if="showLogin" v-on:login:user="onLogin"/>
+            <navigation v-if="user != null"
+                        :courses="gradedCourses"
+                        :user="user"
+                        :nav="nav"
+                        @sign-out="signOut" @select-time="selectTime">
+            </navigation>

-        <div id="app-content" v-if="assignmentsReady && loading === ''">
-            <overall v-if="selectedTab === 'overall'"
-                     :courses="filteredCourses">
-            </overall>
-            <course-page v-if="selectedTab.split('/')[0] === 'course'"
-                         :course="filteredCourses.find(c => +c.id === +selectedTab.split('/')[1])">
-            </course-page>
+            <div id="app-content" v-if="assignmentsReady && loading === ''">
+                <overall v-if="nav.id === 'overall'"
+                         :courses="gradedCourses">
+                </overall>
+                <course-page v-if="nav.id === 'course'"
+                             :course="gradedCourses.find(c => +c.id === +nav.info.id)">
+                </course-page>
+            </div>
+
+            <loading v-if="loading !== ''" :text="loading" :error="loadingError"/>
        </div>

-        <loading v-if="loading !== ''" :text="loading" :error="loadingError"></loading>
+        <Info v-if="staticPage === 'info'"/>
    </div>
 </template>

 <script src="./app.ts" lang="ts"></script>
-<style src="./app.scss" lang="scss"></style>
+<style src="./app.scss" lang="scss"/>
@@ -5,6 +5,13 @@

 }

+// Logo image
+#login-logo-image
+{
+    width: 80%;
+    margin-bottom: -15px;
+}
+
 // Parent overlay
 .login-overlay
 {
@@ -1,43 +1,44 @@
-import {Component, Prop, Vue} from 'vue-property-decorator';
+import {Component, Vue} from 'vue-property-decorator';
 import Constants from '@/constants';
-import {HttpUtils} from '@/utils/http-utils';
 import App from '@/components/app/app';
-import VersionUtils from '@/utils/version-utils';
+import VersionUtils from '@/logic/utils/version-utils';
+import LoginUser from '@/logic/login-user';
+import Maintenance from '@/components/overlays/maintenance.vue';

 /**
 * This component handles user login, and obtains data from the server.
- * TODO: Press enter to login
 */
-@Component({
-    components: {},
-})
+@Component({components: {Maintenance}})
 export default class Login extends Vue
 {
-    public username: any = '';
-    public password: any = '';
+    username = '';
+    password = '';

-    public loading: boolean = false;
-    public error: String = '';
+    loading = false;
+    error = '';
+
+    disableInput = false;
+
+    maintenance = '';

    /**
     * This is called when the instance is created.
     */
-    public created()
+    created()
    {
-        // Check cookies version
-        if (this.needToUpdateCookies())
-        {
-            console.log('Version Updated! Clearing cookies...');
-
-            // Clear all cookies
-            this.$cookies.keys().forEach(key => this.$cookies.remove(key));
-        }
-
        // Check login cookies
        if (this.$cookies.isKey('va.token'))
        {
-            // Already contains valid token / TODO: Validate
-            this.$emit('login:token', this.$cookies.get('va.token'));
+            // Check cookies version
+            if (this.needToUpdateCookies()) this.clearCookies();
+            else
+            {
+                // Show loading
+                this.disableInput = this.loading = true;
+
+                // Login with token
+                this.login('/login/token', {token: this.$cookies.get('va.token')});
+            }
        }
    }

@@ -46,7 +47,7 @@ export default class Login extends Vue
     *
     * @returns boolean Need to clear cookies or not
     */
-    public needToUpdateCookies(): boolean
+    needToUpdateCookies(): boolean
    {
        // Version doesn't exist
        if (!this.$cookies.isKey('va.version')) return true;
@@ -56,50 +57,83 @@ export default class Login extends Vue
    }

    /**
-     * On click, sends username and password to the server.
+     * When the user clicks, send the username and password to the server.
     */
-    public onLoginClick()
+    onLoginClick()
    {
        // Make login button loading
        this.loading = true;

+        // Format it
+        this.username = this.username.toLowerCase().replace(/ /g, '').replace(/@.*/g, '');
+
+        // Login
+        this.login('/login', {username: this.username, password: this.password});
+    }
+
+    /**
+     * Actually post the login request and process the response
+     *
+     * @param url Posting url
+     * @param data Data to be posted
+     */
+    login(url: string, data: any)
+    {
        // Fetch request
-        App.http.post('/login', {username: this.username, password: this.password})
+        App.http.post(url, data)
        .then(response =>
        {
            // Check success
            if (response.success)
            {
-                // Save token to cookies
-                this.$cookies.set('va.token', response.data, '27d');
-                this.$cookies.set('va.version', Constants.VERSION);
+                // Maintenance
+                if (response.data.maintenance)
+                {
+                    this.maintenance = response.data.maintenance;
+                    return;
+                }

-                // Call custom event with token
-                this.$emit('login:token', response.data);
+                // Save token to cookies
+                this.$cookies.set('va.token', response.data.user.token, '27d');
+                this.$cookies.set('va.version', Constants.VERSION, '27d');
+
+                // Call a custom event with the token
+                this.$emit('login:user', new LoginUser(response.data.user));
            }
            else
            {
-                // Show error message
-                this.error = response.data;
+                // Login expired -> clear cookies
+                if (response.data == 'Error: Login expired')
+                {
+                    this.clearCookies();
+                }

-                // Allow the user to retry
-                this.loading = false;
+                // Show error message & allow user to retry
+                this.error = response.data;
+                this.disableInput = this.loading = false;
            }
        })
        .catch(err =>
        {
-            alert(err);
-
-            // Allow the user to retry
-            this.loading = false;
+            // Show error message & allow user to retry
+            this.error = err;
+            this.disableInput = this.loading = false;
        });
    }

    /**
-     * This is called when the user hits enter in the input boxes.
+     * This is called when the user hits enter on the input boxes.
     */
-    public onEnter()
+    onEnter()
    {
        this.onLoginClick();
    }
+
+    /**
+     * Clear cookies
+     */
+    clearCookies()
+    {
+        this.$cookies.keys().forEach(key => this.$cookies.remove(key));
+    }
 }
@@ -2,30 +2,35 @@
    <div id="login" class="login-overlay">
        <div class="login-vertical-center">
            <div class="login-panel">
-                <img alt="Vue logo" src="../../assets/logo.png">
+                <img id="login-logo-image" alt="logo" src="../../assets/logo.png">

                <h1>Veracross Analyzer</h1>
+                <form id="login-form">
+                    <el-input v-model="username"
+                              placeholder="SJP Username (Eg. flast21)"
+                              :class="{'input-error': error !== ''}"
+                              v-if="!disableInput"
+                              @keyup.enter.native="onEnter">
+                    </el-input>

-                <el-input v-model="username"
-                          placeholder="School Username"
-                          :class="{'input-error': error !== ''}"
-                          @keyup.enter.native="onEnter">
-                </el-input>
+                    <el-input v-model="password"
+                              placeholder="SJP Password"
+                              show-password=""
+                              :class="{'input-error': error !== ''}"
+                              v-if="!disableInput"
+                              @keyup.enter.native="onEnter">
+                    </el-input>

-                <el-input v-model="password"
-                          placeholder="Veracross Password"
-                          show-password=""
-                          :class="{'input-error': error !== ''}"
-                          @keyup.enter.native="onEnter">
-                </el-input>
+                    <div class="el-form-item__error custom">{{error}}</div>

-                <div class="el-form-item__error custom">{{error}}</div>
-
-                <el-button plain type="primary" @click="onLoginClick" :loading="loading">Login</el-button>
+                    <el-button plain type="primary" @click="onLoginClick" :loading="loading">Login</el-button>
+                </form>
            </div>
        </div>
+
+        <Maintenance v-if="maintenance" :message="maintenance"/>
    </div>
 </template>

 <script src="./login.ts" lang="ts"></script>
-<style src="./login.scss" lang="scss"></style>
+<style src="./login.scss" lang="scss"/>
@@ -16,6 +16,13 @@
    }
 }

+#nav-avatar
+{
+    position: absolute;
+    right: 0;
+    margin: 10px 20px;
+}
+
 #sign-out-button
 {
    // Float right
@@ -27,6 +34,17 @@
    width: 110px;
 }

+#nav-grading-period
+{
+    // Float right
+    position: absolute;
+    right: 80px;
+
+    // Margins
+    margin-top: 12px;
+    margin-bottom: 12px;
+}
+
 #nav-title
 {
    // Float left
@@ -37,15 +55,49 @@
    height: 60px;

    // Center text
+    display: inline-flex;
    align-items: center;

    // Margins
-    margin-left: 14px;
+    margin-left: 20px;
    margin-right: 8px;

-    // Font
-    font-size: 1.25rem;
-    display: inline-flex;
+    // Make it non-clickable
+    pointer-events: none;
+
+    #nav-logo
+    {
+        height: 70%;
+        margin-right: 10px;
+    }
+
+    #nav-logo-text
+    {
+        // Color
+        color: #6bbeff !important;
+        background: linear-gradient(90deg,
+                rgba(90,177,239,1) 0%,
+                rgba(25,212,174,1) 100%) !important;
+
+        // Font
+        font-weight: 500;
+        font-size: 18px;
+    }
+
+    #nav-logo-text.logo-text
+    {
+        // Override the background
+        -webkit-text-fill-color: transparent !important;
+        -webkit-background-clip: text !important;
+    }
+
+    #nav-logo-version
+    {
+        color: #a7a7a7;
+        margin-left: 5px;
+        margin-top: 8px;
+        font-size: 10px;
+    }
 }

 #next-course
@@ -56,10 +108,17 @@
    bottom: 0;
    left: 25%;
    padding-top: 2px;
-    box-shadow: 0 -2px 9px 0 #ecebeb;
+    box-shadow: 0 -2px 9px 0 #00000029;
+}

-    // Trapezoid
-    transform: perspective(50px) rotateX(10deg);
+footer
+{
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+
+    z-index: 1000;
 }

 #prev-course
@@ -70,10 +129,9 @@
    top: 61px;
    left: 25%;
    padding-bottom: 2px;
-    box-shadow: 0 2px 9px 0 #ecebeb;
+    box-shadow: 0 2px 9px 0 #00000029;

-    // Trapezoid
-    transform: perspective(50px) rotateX(-10deg);
+    z-index: 1001;
 }

 .nav-course-operations
@@ -1,57 +1,44 @@
 import {Component, Prop, Vue} from 'vue-property-decorator';
+import Course from '@/logic/course';
 import Constants from '@/constants';
-import {Course} from '@/components/app/app';
-import {CourseUtils} from '@/utils/course-utils';
-import {FormatUtils} from '@/utils/format-utils';
+import LoginUser from '@/logic/login-user';
+import NavController from '@/logic/nav-controller';
+import App from '@/components/app/app';

 /**
 * This component is the top navigation bar
 */
-@Component({
-    components: {},
-})
+@Component
 export default class Navigation extends Vue
 {
-    // @ts-ignore
-    @Prop() activeIndex: string;
+    @Prop({required: true}) nav: NavController;
+    @Prop({required: true}) courses: Course[];
+    @Prop({required: true}) user: LoginUser;

-    // @ts-ignore
-    @Prop() courses: Course[];
+    private gradingPeriod: string = 'All Year';

    // Instance
-    public static instance: Navigation;
+    static instance: Navigation;

    /**
     * This is called when the instance is created.
     */
-    public created()
+    created()
    {
-        // Set instance
-        Navigation.instance = this;
-
-        // Set history state
-        let url = window.location.pathname;
-        if (url == '/' || url == '') url = '/overall';
-        window.history.replaceState({lastTab: url.substring(1)}, '', url);
-
-        // Update initial index
-        this.updateIndex(url.substring(1), false);
-
-        // Create history state listener
-        window.onpopstate = e =>
+        // Check selected time
+        if (!this.$cookies.isKey('va.grading-period'))
        {
-            if (e.state)
-            {
-                // Restore previous tab
-                console.log(`onPopState: Current: ${this.activeIndex}, Previous: ${e.state.lastTab}`);
-                this.updateIndex(e.state.lastTab, false);
-            }
-        };
+            this.$cookies.set('va.grading-period', this.gradingPeriod, '10y');
+        }
+        this.gradingPeriod = this.$cookies.get('va.grading-period');
    }

-    public formatCourseIndex(course: Course)
+    /**
+     * This is called when the instance is loaded.
+     */
+    mounted()
    {
-        return CourseUtils.formatTabIndex(course);
+        Navigation.instance = this;
    }

    /**
@@ -60,55 +47,19 @@ export default class Navigation extends Vue
     * @param index The index selected
     * @param indexPath The path of the index
     */
-    public onSelect(index: string, indexPath: string)
+    onSelect(index: string, indexPath: string)
    {
        // Update active index
-        this.updateIndex(index);
-    }
-
-    /**
-     * Update index
-     *
-     * @param newIndex New index
-     * @param history Record in history or not (Default true)
-     */
-    public updateIndex(newIndex: string, history?: boolean)
-    {
-        // Call custom event
-        this.$emit('update:activeIndex', newIndex);
-
-        // Record or not
-        if (history == null || history)
+        try
        {
-            // Debug output TODO: Remove this
-            console.log(`onNavigate: Previous: ${this.activeIndex}, New: ${newIndex}`);
-
-            // Check url
-            let url = `/${newIndex}`;
-
-            // Push history state
-            window.history.pushState({lastTab: newIndex}, '', url);
+            // Is json
+            this.nav.updateIndex(JSON.parse(index))
        }
-
-        // Update title
-        document.title = 'Veracross Analyzer - ' + this.getTitle(newIndex);
-    }
-
-    /**
-     * Get title for index
-     *
-     * @param index Index
-     */
-    public getTitle(index: string)
-    {
-        // Course
-        if (index.startsWith('course'))
+        catch (e)
        {
-            return this.findCourse(index.split('/')[1], 0).name;
+            // Not json
+            this.nav.updateIndex(index);
        }
-
-        // Others
-        return FormatUtils.toTitleCase(index);
    }

    /**
@@ -116,10 +67,10 @@ export default class Navigation extends Vue
     *
     * @param indexOffset Index offset (Eg. 1 for next)
     */
-    public nextCourse(indexOffset: number)
+    nextCourse(indexOffset: number)
    {
        // Set tab to the next index
-        this.updateIndex(CourseUtils.formatTabIndex(this.findNextCourse(indexOffset)))
+        this.nav.updateIndex(this.findNextCourse(indexOffset).urlIndex)
    }

    /**
@@ -127,9 +78,9 @@ export default class Navigation extends Vue
     *
     * @param indexOffset Index offset (Eg. 1 for next)
     */
-    public findNextCourse(indexOffset: number)
+    findNextCourse(indexOffset: number)
    {
-        return this.findCourse(this.activeIndex.split('/')[1], indexOffset);
+        return this.findCourse(this.nav.info.id, indexOffset);
    }

    /**
@@ -138,7 +89,7 @@ export default class Navigation extends Vue
     * @param courseId Course ID
     * @param indexOffset Index offset (Eg. 1 for next)
     */
-    public findCourse(courseId: string, indexOffset: number)
+    findCourse(courseId: string, indexOffset: number)
    {
        // Find current course index
        let courseIndex = this.courses.findIndex(c => c.id == +courseId);
@@ -148,11 +99,58 @@ export default class Navigation extends Vue
    }

    /**
-     * This function is called when the sign out button is clicked.
+     * Select grading period
+     *
+     * @param command Term 1, Term 2, All Year, etc.
     */
-    public signOut()
+    selectGradingPeriod(command: string)
    {
-        // Call custom event
-        this.$emit('sign-out');
+        this.gradingPeriod = command;
+        this.$cookies.set('va.grading-period', command, '10y');
+
+        // Call event
+        this.$emit('select-time', this.getSelectedTerm());
    }
+
+    /**
+     * Get code for selected time
+     */
+    getSelectedTerm(): number
+    {
+        if (this.gradingPeriod == 'All Year') return -1;
+        else return +this.gradingPeriod.replace('Term ', '') - 1;
+    }
+
+    /**
+     * Avatar dropdown menu event
+     *
+     * @param cmd Command: sign-out
+     */
+    onAvatarMenu(cmd: string)
+    {
+        switch (cmd)
+        {
+            case 'sign-out':
+            {
+                this.$emit('sign-out');
+                break
+            }
+            case 'switch-dark':
+            {
+                App.instance.darkMode = !App.instance.darkMode;
+
+                if (this.isDark()) this.$cookies.set('dark', true);
+                else this.$cookies.remove('dark');
+
+                break
+            }
+        }
+    }
+
+    isDark()
+    {
+        return App.instance.darkMode;
+    }
+
+    get version() {return Constants.VERSION}
 }
@@ -1,33 +1,68 @@
 <template>
    <div id="navigation">
        <el-menu style="margin-bottom: 10px;" class="centered" mode="horizontal"
-                 :default-active="activeIndex" @select="onSelect">
+                 :default-active="nav.id" @select="onSelect">

-            <!--div id="nav-title">
-                Veracross Analyzer
-            </div-->
+            <div id="nav-title">
+                <img id="nav-logo" alt="logo" src="../../assets/logo.png">
+                <span id="nav-logo-text" class="logo-text">Veracross Analyzer</span>
+                <span id="nav-logo-version">v{{version}}</span>
+            </div>

            <el-menu-item index="overall">Overall</el-menu-item>

-            <el-submenu index="courses">
+            <el-submenu index="">
                <template slot="title">Courses</template>
                <el-menu-item v-for="course in courses"
-                              :index="formatCourseIndex(course)"
-                              :key="course.name">{{course.name}}</el-menu-item>
+                              :index="JSON.stringify(course.urlIndex)"
+                              :key="course.id">{{course.name}}</el-menu-item>
            </el-submenu>

-            <el-button @click="signOut" id="sign-out-button" type="text">Sign Out</el-button>
+            <!-- Grading period selection -->
+            <el-dropdown id="nav-grading-period" @command="selectGradingPeriod">
+                <el-button type="primary" size="medium">
+                    {{gradingPeriod}}<i class="el-icon-arrow-down el-icon--right"/>
+                </el-button>
+                <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item command="Term 1">Term 1</el-dropdown-item>
+                    <el-dropdown-item command="Term 2">Term 2</el-dropdown-item>
+                    <el-dropdown-item command="Term 3">Term 3</el-dropdown-item>
+                    <el-dropdown-item command="Term 4" disabled>Term 4</el-dropdown-item>
+<!--                    TODO: Auto enable / disable quarters -->
+                    <el-dropdown-item command="All Year" divided>All Year</el-dropdown-item>
+                </el-dropdown-menu>
+            </el-dropdown>
+
+            <!-- User avatar -->
+            <el-dropdown id="nav-avatar" trigger="click" @command="onAvatarMenu">
+                <el-avatar :src="user.avatarUrl"/>
+
+                <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item style="text-align: center">{{user.nickname}}</el-dropdown-item>
+
+                    <el-dropdown-item icon="el-icon-sunrise" command="switch-dark" divided>{{!isDark() ? 'Dark Mode (Unfinished)' : 'Light Mode'}}</el-dropdown-item>
+
+                    <el-dropdown-item icon="el-icon-switch-button" command="sign-out" divided>Sign Out</el-dropdown-item>
+                </el-dropdown-menu>
+            </el-dropdown>
        </el-menu>
-        <div v-if="activeIndex.includes('course') && findNextCourse(-1) != null"
+
+        <!-- Previous course / Next course (Only when the page is courses) -->
+        <div v-if="nav.id === 'course' && findNextCourse(-1) != null"
             @click="nextCourse(-1)" id="prev-course" class="nav-course-operations unselectable">
            ▲ PREVIOUS COURSE ▲
        </div>
-        <div v-if="activeIndex.includes('course') && findNextCourse(1) != null"
-             @click="nextCourse(1)" id="next-course" class="nav-course-operations unselectable">
-            ▼ NEXT COURSE ▼
-        </div>
+        <footer>
+            <div v-if="nav.id === 'course' && findNextCourse(1) != null"
+                 @click="nextCourse(1)" id="next-course" class="nav-course-operations unselectable">
+                ▼ NEXT COURSE ▼
+            </div>
+        </footer>
+
+        <!-- Back to top -->
+        <el-backtop style="box-shadow: rgba(0, 0, 0, 0.23) 0 3px 11px 0;"/>
    </div>
 </template>

 <script src="./navigation.ts" lang="ts"></script>
-<style src="./navigation.scss" lang="scss"></style>
+<style src="./navigation.scss" lang="scss"/>
@@ -1,7 +1,7 @@
 <template>
    <div id="loading">
-        <div id="text" :class="message()">
-            {{message()}}
+        <div id="text" :class="message">
+            {{message}}

            <div v-if="!error" class="el-loading-spinner">
                <svg viewBox="25 25 50 50" class="circular">
@@ -10,7 +10,7 @@
            </div>

            <div v-if="error" id="error-details">
-                <span v-for="(line, index) in getText()" :style="`font-size: ${-index === 0 ? 16 : 12}px;`">
+                <span v-for="(line, index) in split" :style="`font-size: ${-index === 0 ? 16 : 12}px;`">
                    {{line}}
                    <br>
                </span>
@@ -18,7 +18,7 @@
        </div>

        <div v-if="!error" id="details">
-            <span v-for="(line, index) in getText()" :style="`font-size: ${16 - getText().length + index}px;`">
+            <span v-for="(line, index) in split" :style="`font-size: ${16 - split.length + index}px;`">
                {{line}}
                <br>
            </span>
@@ -29,23 +29,19 @@
 <script lang="ts">
    import {Component, Prop, Vue} from 'vue-property-decorator';

-    @Component({
-        components: {}
-    })
+    @Component
    export default class Loading extends Vue
    {
-        // @ts-ignore
-        @Prop() text: string;
+        @Prop({required: true}) text: string;

-        // @ts-ignore
-        @Prop() error: boolean;
+        @Prop({required: true}) error: boolean;

-        getText()
+        get split()
        {
            return this.text.split('\n');
        }

-        message()
+        get message()
        {
            return this.error ? 'Error' : 'Loading';
        }
@@ -0,0 +1,63 @@
+<template>
+    <div id="maintenance">
+        <div id="maintenance-content">
+            <h1>We&rsquo;ll be back soon!</h1>
+            <div>
+                <p>Sorry for the inconvenience but we&rsquo;re performing some maintenance at the moment.
+                    We&rsquo;ll be back online shortly!</p>
+
+                <p>What went wrong: {{json.reason}}</p>
+
+                <p>Estimated fix: {{json.eta}}</p>
+
+                <p>&mdash; An Average SJP Junior</p>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script lang="ts">
+    import {Component, Prop, Vue} from 'vue-property-decorator';
+
+    @Component
+    export default class Maintenance extends Vue
+    {
+        @Prop({required: true}) message: any;
+
+        get json()
+        {
+            return JSON.parse(this.message);
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    #maintenance
+    {
+        z-index: 1000;
+        background: white;
+        position: absolute;
+        width: 100%;
+        height: 100%;
+        top: 0;
+        left: 0;
+
+        #maintenance-content
+        {
+            font: 20px Helvetica, sans-serif;
+            color: #333;
+
+            display: block;
+            text-align: left;
+            margin: 150px;
+
+            h1
+            {
+                font-size: 50px;
+            }
+
+            a {color: #dc8100; text-decoration: none;}
+            a:hover {color: #333; text-decoration: none;}
+        }
+    }
+</style>
@@ -1,20 +1,23 @@
 /**
 * This class stores the static constants.
 */
+import {findLastIndex} from '@/logic/utils/general-utils';
+
 export default class Constants
 {
    /** Base url for api access */
-    public static API_URL: string = 'https://va.hydev.org/api';
+    static API_URL: string = 'https://va.hydev.org/api';
+    // static API_URL: string = 'http://localhost:24021/api';

    /** Current version */
-    public static VERSION: string = '0.3.6.741';
+    static VERSION: string = '0.5.4.1391';

-    /** Minimum version that still supports the same cookies */
-    public static MIN_SUPPORTED_VERSION: string = '0.3.4.561';
+    /** The minimum version that still supports the same cookies */
+    static MIN_SUPPORTED_VERSION: string = '0.4.6.1087';

-    public static GITHUB: string = 'https://github.com/HyDevelop/VeracrossAnalyzer.Client';
+    static GITHUB: string = 'https://github.com/HyDevelop/VeracrossAnalyzer.Client';

-    public static SPLASH: string =
+    static SPLASH: string =
        '.    ,        ,---.          |                        \n' +
        '|    |.  ,    |---|,---.,---.|    ,   .,---,,---.,---.\n' +
        ' \\  /  ><     |   ||   |,---||    |   | .-\' |---\'|    \n' +
@@ -24,7 +27,7 @@ export default class Constants
        ` Github: ${Constants.GITHUB}`;

    // Graph Theme
-    public static THEME =
+    static THEME =
    {
        // Colors
        colors:
@@ -53,5 +56,26 @@ export default class Constants
            '#724e58',
            '#4b565b'
        ]
+    };
+
+    // Terms (TODO: Actually get the terms dynamically
+    static TERMS =
+    [
+        new Date('Sep 04 2019'),
+        new Date('Nov 03 2019'),
+        new Date('Jan 19 2020'),
+        new Date('Mar 22 2020'),
+        new Date('Jun 05 2020'),
+    ];
+    static CURRENT_TERM = Constants.getTerm(new Date());
+
+    /**
+     * Find out the specified date is in which term
+     *
+     * @param date
+     */
+    static getTerm(date: Date)
+    {
+        return findLastIndex(Constants.TERMS, d => d <= date);
    }
 }
@@ -0,0 +1,423 @@
+import {FormatUtils} from '@/logic/utils/format-utils';
+import {CourseUtils} from '@/logic/utils/course-utils';
+import Navigation from '@/components/navigation/navigation';
+import {GPAUtils} from '@/logic/utils/gpa-utils';
+import CacheUtils from '@/logic/utils/cache-utils';
+import Constants from '@/constants';
+import {Index} from '@/logic/nav-controller';
+import App from '@/components/app/app';
+
+/**
+ * Objects of this interface represent assignment grades.
+ */
+export class Assignment
+{
+    id: number;
+    scoreId: number;
+    type: string;
+    typeId: number;
+    description: string;
+    time: number;
+    complete: string;
+    include: boolean;
+    display: boolean;
+
+    unread: boolean;
+
+    scoreMax: number;
+    score: number;
+
+    gradingPeriod: number;
+
+    // Callbacks when this object updates
+    private updateCallbacks: (() => void)[] = [];
+
+    /**
+     * Construct assignment with json object
+     *
+     * @param json Json object
+     */
+    constructor(json: any)
+    {
+        this.id =  json.assignment_id;
+        this.scoreId =  json.score_id;
+        this.type =  json.assignment_type;
+        this.typeId =  json.assignment_type_id;
+        this.description =  json.assignment_description;
+        this.time =  new Date(json._date).getTime();
+        this.complete =  json.completion_status;
+        this.include =  json.include_in_calculated_grade == 1;
+        this.display =  json.display_grade == 1;
+
+        this.unread =  json.is_unread == 1;
+
+        this.scoreMax =  json.maximum_score;
+        this.score =  +json.raw_score;
+
+        this.gradingPeriod =  +json.grading_period.replace('Quarter ', '') - 1;
+    }
+
+    /**
+     * Graded or not
+     */
+    get graded()
+    {
+        // TODO: Add more cases
+        // Incomplete doesn't mean that the teacher didn't grade it yet, which is "Pending".
+        // NREQ is not graded.
+        return this.include && (this.complete == 'Complete' || this.complete == 'Late' || this.complete == 'Incomplete');
+    }
+
+    /**
+     * What is the problem with this assignment
+     *
+     * @return string Empty string if complete, otherwise return problem.
+     */
+    get problem()
+    {
+        switch (this.complete)
+        {
+            case 'Pending': return 'Pending'; // ID: 0
+            case 'Incomplete': return 'Incomplete'; // ID: 2
+            case 'Complete': return ''; // ID: 3
+            case 'NREQ': return 'Dropped'; // ID: 4
+            case 'Late': return 'Late';
+        }
+    }
+
+    /**
+     * Get the text color of the problem
+     */
+    get problemColor()
+    {
+        switch (this.complete)
+        {
+            case 'Pending': return '#b1b1b1';
+            case 'Incomplete': return '#ff7a2f';
+            case 'NREQ': return '#41b141';
+            case 'Late': return '#ff0036';
+        }
+    }
+
+    /**
+     * Add callback
+     *
+     * @param callback
+     */
+    addCallback(callback: () => void)
+    {
+        this.updateCallbacks.push(callback);
+    }
+
+    /**
+     * Mark as read
+     */
+    markAsRead(): Promise<void>
+    {
+        return new Promise((resolve, reject) => {
+            App.http.post('/mark-as-read', {scoreId: this.scoreId})
+            .then(response =>
+            {
+                // Check success
+                if (response.success)
+                {
+                    this.unread = false;
+                    this.updateCallbacks.forEach(callback => callback());
+                    resolve();
+                }
+                else reject(response.data);
+            })
+            .catch(reject)
+        })
+    }
+}
+
+export interface AssignmentType
+{
+    id: number
+    name: string
+
+    weight: number
+    scoreMax: number
+    score: number
+    percent: number
+    assignmentCount: number
+}
+
+export interface Grading
+{
+    method: string
+    weightingMap: {[index: string]: number}
+}
+
+export default class Course
+{
+    id: number;
+    assignmentsId: number;
+    name: string;
+    teacherName: string;
+    status: string;
+    rawAssignments: Assignment[];
+
+    rawLetterGrade?: string;
+    rawNumericGrade?: number;
+
+    level: string;
+    scaleUp: number;
+
+    termGrading: Grading[];
+    termAssignments: Assignment[][];
+
+    cache: CacheUtils = new CacheUtils();
+
+    /**
+     * Construct a course with a course json object
+     *
+     * @param courseJson Course json object
+     */
+    constructor(courseJson: any)
+    {
+        this.id = courseJson.id;
+        this.assignmentsId = courseJson.assignmentsId;
+        this.name = FormatUtils.parseText(courseJson.name).trim();
+        this.teacherName = courseJson.teacherName;
+        this.status = courseJson.status;
+
+        this.rawLetterGrade = courseJson.letterGrade;
+        this.rawNumericGrade = courseJson.numericGrade;
+
+        // Other api issue
+        if (this.rawLetterGrade == '')
+        {
+            this.rawNumericGrade = undefined;
+            this.rawLetterGrade = undefined;
+        }
+
+        // Level and scaleUp
+        let level = CourseUtils.detectLevel(this.name);
+        if (level != undefined)
+        {
+            this.level = level.level;
+            this.scaleUp = level.scaleUp;
+        }
+        else this.level = 'Unknown';
+
+        this.termGrading = new Array(4).fill(null);
+    }
+
+    /**
+     * Load in assignments data
+     *
+     * @param data Assignments data
+     */
+    loadAssignments(data: any)
+    {
+        // Load assignments
+        // Parse json and filter it
+        this.rawAssignments = data.assignments.map((a: any) => new Assignment(a));
+
+        // Sort by date (Latest is at 0)
+        this.rawAssignments.sort((a, b) => b.time - a.time);
+
+        // Filter assignments into terms
+        this.termAssignments = [[], [], [], []];
+
+        // Loop through it by time order
+        this.rawAssignments.forEach(a => this.termAssignments[a.gradingPeriod].push(a));
+    }
+
+    /**
+     * Is graded or not
+     */
+    get isGraded(): boolean
+    {
+        // Skip future or past courses
+        if (this.status != 'active') return false;
+
+        // Skip courses without levels TODO: Ask for user input
+        if (this.level == 'None' || this.level == 'Unknown' || this.scaleUp == -1) return false;
+
+        // Skip courses without graded assignments
+        if (this.assignments.length == 0) return false;
+
+        // Skip if there are no grading scale
+        // if (course.grading.method == 'NOT_GRADED') return;
+
+        // Is graded
+        return true;
+    }
+
+    /**
+     * Get currently selected grading periods
+     */
+    get gradingPeriods(): number[]
+    {
+        return this.cache.get('GradingPeriods', () =>
+        {
+            return (this.rawSelectedTerm == -1 ? [0, 1, 2, 3] : [this.rawSelectedTerm]).filter(term =>
+                this.termAssignments[term].filter(a => a.graded).length != 0);
+        })
+    }
+
+    /**
+     * Get currently selected grading periods
+     */
+    get allGradingPeriods(): number[]
+    {
+        return this.cache.get('AllGradingPeriods', () =>
+        {
+            return [0, 1, 2, 3].filter(term => this.termAssignments[term].filter(a => a.graded).length != 0);
+        })
+    }
+
+    /**
+     * Get assignments of the selected grading periods
+     */
+    get assignments(): Assignment[]
+    {
+        return this.gradingPeriods
+            .flatMap(term => this.termAssignments[term])
+            .sort((a, b) => b.time - a.time);
+    }
+
+    /**
+     * Get assignments before a certain date
+     *
+     * @param time
+     */
+    getAssignmentsBefore(time: number): {term: number, assignments: Assignment[]}
+    {
+        let term = Constants.getTerm(new Date(time));
+        let assignments = this.assignments.filter(a => a.gradingPeriod == term && a.time <= time);
+
+        return {term: term, assignments: assignments}
+    }
+
+    /**
+     * Get letter grade
+     */
+    get letterGrade(): string
+    {
+        return this.cache.get('LetterGrade', () =>
+        {
+            // Get scale
+            let scale = GPAUtils.findScale(this.numericGrade);
+
+            // Scale not found
+            return scale == undefined ? '--' : scale.letter;
+        })
+    }
+
+    /**
+     * Get letter grade by term
+     *
+     * @param term
+     */
+    letterGradeTerm(term: number): string
+    {
+        return this.cache.get('LetterGrade' + term, () =>
+        {
+            // Get scale
+            let scale = GPAUtils.findScale(this.numericGradeTerm(term));
+
+            // Scale not found
+            return scale == undefined ? '--' : scale.letter;
+        })
+    }
+
+    /**
+     * Get numeric grade
+     */
+    get numericGrade()
+    {
+        return this.cache.get('NumericGrade', () =>
+        {
+            return this.gradingPeriods.map(term => this.numericGradeTerm(term))
+                    .reduce((p, v) => p + v) / this.gradingPeriods.length
+        })
+    }
+
+    /**
+     * Get numeric grade by term
+     *
+     * @param term
+     */
+    numericGradeTerm(term: number): number
+    {
+        return this.cache.get('NumericGrade' + term, () =>
+        {
+            // Calculate
+            if (this.termGrading[term].method == 'PERCENT_TYPE')
+            {
+                return GPAUtils.getPercentTypeAverage(this.termGrading[term], this.termAssignments[term]);
+            }
+            else if (this.termGrading[term].method == 'TOTAL_MEAN')
+            {
+                return GPAUtils.getTotalMeanAverage(this.termAssignments[term]);
+            }
+            else return -1;
+        })
+    }
+
+    /**
+     * Get assignment types
+     */
+    get assignmentTypes(): AssignmentType[]
+    {
+        return this.cache.get('AssignmentTypes', () =>
+        {
+            // Get all types
+            let types = this.assignments.map(a => a.type);
+
+            // Remove duplicates
+            types = types.filter((type, i, a) => a.indexOf(type) == i);
+
+            // Get total possible score for weight calculation
+            let totalScoreMax = this.assignments.reduce((sum, a) => sum + a.scoreMax, 0);
+
+            // For every type...
+            return types.map(type =>
+            {
+                // Get assignments of the type
+                let typeAssignments = this.assignments.filter(a => a.graded && a.type == type);
+
+                // Count scores and max scores
+                let score = typeAssignments.reduce((sum, a) => sum + a.score, 0);
+                let scoreMax = typeAssignments.reduce((sum, a) => sum + a.scoreMax, 0);
+
+                // Calculate weight
+                let weight = this.termGrading[0].method == 'PERCENT_TYPE'
+                    ? this.termGrading[0].weightingMap[type] : scoreMax / totalScoreMax;
+
+                // Return
+                return {name: type, id: typeAssignments[0].typeId, weight: +(weight * 100).toFixed(2),
+                    scoreMax: scoreMax, score: score, percent: +(score / scoreMax * 100).toFixed(2),
+                    assignmentCount: typeAssignments.length}
+            })
+        })
+    }
+
+    /**
+     * Get url hash code
+     */
+    get urlHash(): string
+    {
+        return `course/${this.id}`
+    }
+
+    /**
+     * Get navigation index
+     */
+    get urlIndex(): Index
+    {
+        return {hash: this.urlHash, title: this.name, identifier: 'course', info: {id: this.id}}
+    }
+
+    /**
+     * Selected term
+     */
+    get rawSelectedTerm(): number
+    {
+        return Navigation.instance.getSelectedTerm()
+    }
+}
@@ -0,0 +1,46 @@
+const md5 = require('md5');
+
+export default class LoginUser
+{
+    id: number;
+    schoolPersonPk: number;
+    username: string;
+    lastLogin: Date;
+    firstLogin: Date;
+    firstName: string;
+    lastName: string;
+    nickname: string;
+    graduationYear: string;
+    groups: string;
+    emails: string[];
+    classes: string[];
+    birthday: string;
+    avatarUrl: string;
+    token: string;
+
+    constructor(json: any)
+    {
+        this.id = json.id;
+        this.schoolPersonPk = json.schoolPersonPk;
+        this.username = json.username;
+        this.lastLogin = new Date(json.lastLogin);
+        this.firstLogin = new Date(json.firstLogin);
+        this.firstName = json.firstName;
+        this.lastName = json.lastName;
+        this.nickname = json.nickname;
+        this.graduationYear = json.graduationYear;
+        this.groups = json.groups;
+        this.emails = json.emails.split('|').map((e: any) => e.toLowerCase().trim());
+        this.classes = json.classes.split('|');
+        this.birthday = json.birthday;
+        this.avatarUrl = json.avatarUrl;
+        this.token = json.token;
+
+        // Generate default avatar
+        if (this.avatarUrl == null || this.avatarUrl == '')
+        {
+            this.avatarUrl = `https://www.gravatar.com/avatar/${md5(this.emails[0])}?d=404` + encodeURIComponent(
+                `https://ui-avatars.com/api/${this.firstName.charAt(0)}${this.lastName.charAt(0)}/128`);
+        }
+    }
+}
@@ -0,0 +1,160 @@
+import {FormatUtils} from '@/logic/utils/format-utils';
+import pWaitFor from 'p-wait-for';
+import App from '@/components/app/app';
+
+export interface Index
+{
+    hash: string
+    title?: string
+    identifier: string
+    info?: any
+}
+
+export default class NavController
+{
+    // Current index
+    index: Index;
+
+    // Callback
+    updateCallback?: () => void;
+
+    constructor()
+    {
+        // Create history state listener
+        window.onpopstate = (e: any) =>
+        {
+            if (e.state)
+            {
+                // Restore previous tab
+                //console.log(`onPopState: Current: ${this.index.hash}, Previous: ${e.state.hash}`);
+                this.updateIndex(e.state, false);
+            }
+        };
+
+        // Initialize
+        this.init()
+    }
+
+    /**
+     * Initialize from last location
+     */
+    private init()
+    {
+        if (window.location.hash == '#info') return;
+
+        // Check history from last session
+        if (window.history.state != undefined && window.history.state.hash != undefined)
+        {
+            // Last history exists
+            this.index = window.history.state;
+            return;
+        }
+
+        // Last history doesn't exist but hash url might exist
+        let hash = window.location.hash.replace('#', '');
+
+        // Check hash
+        if (hash == '')
+        {
+            // No location info in url, set page to overall
+            window.history.replaceState(this.convertIndex('overall'), '', '/#overall');
+            this.updateIndex('overall', false);
+            return;
+        }
+
+        // There is hash info in url
+        let split = hash.split('/');
+
+        // Not course -> don't know what to do with this url, so just refresh
+        if (split[0] != 'course')
+        {
+            this.initClear();
+            return;
+        }
+
+        // Is course -> Update index with placeholder title
+        this.updateIndex({hash: hash, title: `Loading...`, identifier: 'course', info: {id: +split[1]}}, false);
+
+        // Wait for courses to finish loading
+        pWaitFor(() => App.instance != undefined && App.instance.assignmentsReady).then(() =>
+        {
+            // Find course
+            let course = App.instance.courses.find(c => c.id == +split[1]);
+
+            // This person has no such course, refresh to overall
+            if (course == null)
+            {
+                this.initClear();
+                return;
+            }
+
+            window.history.replaceState(course.urlIndex, '', '/#' + course.urlHash);
+            this.updateIndex(course.urlIndex, false);
+        })
+    }
+
+    private initClear()
+    {
+        window.location.hash = '';
+        window.location.reload();
+    }
+
+    /**
+     * Update index
+     *
+     * @param index Hash and title | Hash only
+     * @param history Record in history or not (Default true)
+     */
+    updateIndex(index: Index | string, history: boolean = true)
+    {
+        index = this.convertIndex(index);
+
+        // Call custom event
+        if (this.updateCallback != null) this.updateCallback();
+
+        // Record history or not
+        if (history)
+        {
+            //console.log(`history: Current: ${this.index.hash}, New: ${index.hash}`);
+
+            // Check url
+            let url = `/#${index.hash}`;
+
+            // Push history state
+            window.history.pushState(index, '', url);
+        }
+
+        // Update title
+        document.title = 'Veracross Analyzer - ' + index.title;
+
+        // Scroll to top
+        window.scrollTo(0, 0);
+
+        // Update selected index
+        this.index = index;
+    }
+
+    /**
+     * Check index conversion
+     *
+     * @param index Hash and title | Hash only
+     * @return Index Hash and title
+     */
+    private convertIndex(index: Index | string): Index
+    {
+        // Convert index format if it is hash only
+        if (typeof index == 'string') index = {hash: index, identifier: index};
+        if (index.title == null) index.title = FormatUtils.toTitleCase(index.hash);
+        return index;
+    }
+
+    get id(): string
+    {
+        return this.index.identifier
+    }
+
+    get info(): any
+    {
+        return this.index.info
+    }
+}
@@ -0,0 +1,20 @@
+
+export default class CacheUtils
+{
+    map: Map<string, any> = new Map();
+
+    /**
+     * Get a cached value, or if not cached, cache it.
+     *
+     * @param name Name of the cached value
+     * @param callback Callback function
+     */
+    public get(name: string, callback: () => any)
+    {
+        if (!this.map.has(name))
+        {
+            this.map.set(name, callback());
+        }
+        return this.map.get(name);
+    }
+}
@@ -0,0 +1,77 @@
+import Navigation from '@/components/navigation/navigation';
+import Constants from '@/constants';
+
+const LEVEL_AP = {level: 'AP', scaleUp: 1};
+const LEVEL_H = {level: 'H', scaleUp: 0.75};
+const LEVEL_A = {level: 'A', scaleUp: 0.5};
+const LEVEL_CP = {level: 'CP', scaleUp: 0.25};
+const LEVEL_CLUB = {level: 'Club', scaleUp: -1};
+
+const UNKNOWN_COURSE_LIST = new Map();
+UNKNOWN_COURSE_LIST.set('Piano Masterclass', LEVEL_H);
+UNKNOWN_COURSE_LIST.set('Multivariable Calculus with Differential Equations', LEVEL_H);
+UNKNOWN_COURSE_LIST.set('Introduction to Algorithmic Thinking and Computational Technologies', LEVEL_A);
+UNKNOWN_COURSE_LIST.set('Ceramics 1', LEVEL_CP);
+UNKNOWN_COURSE_LIST.set('Ceramics 2', LEVEL_A);
+UNKNOWN_COURSE_LIST.set('Sculpture', LEVEL_CP);
+UNKNOWN_COURSE_LIST.set('Drawing', LEVEL_CP);
+UNKNOWN_COURSE_LIST.set('Painting', LEVEL_CP);
+
+export class CourseUtils
+{
+    /**
+     * Detect course level based on course name
+     *
+     * @param name Course name
+     */
+    static detectLevel(name: string)
+    {
+        // Common ones
+        if (name.startsWith('AP')) return LEVEL_AP;
+        if (name.endsWith(' H')) return LEVEL_H;
+        if (name.endsWith(' A')) return LEVEL_A;
+        if (name.endsWith(' CP')) return LEVEL_CP;
+        if (name.startsWith('HS ')) return LEVEL_CLUB;
+        if (name.startsWith('MS ')) return LEVEL_CLUB;
+
+        // Uncommon ones
+        let lower = name.toLowerCase();
+
+        if (name.startsWith('Pre-AP')) return LEVEL_AP;
+        if (lower.endsWith(' acc')) return LEVEL_A;
+        if (name.endsWith('H')) return LEVEL_H;
+        if (name.endsWith('A')) return LEVEL_A;
+        if (name.endsWith('CP')) return LEVEL_CP;
+
+        // Even more uncommon
+        if (lower.includes('honors')) return LEVEL_H;
+        if (lower.includes('accelerated')) return LEVEL_A;
+        if (name.includes('Advanced')) return LEVEL_A;
+
+        // Unknown course list
+        if (UNKNOWN_COURSE_LIST.has(name)) return UNKNOWN_COURSE_LIST.get(name);
+
+        // Really unknown
+        return undefined;
+    }
+
+    /**
+     * Get the begin date of the selected term
+     */
+    static getTermBeginDate()
+    {
+        let selected = Navigation.instance.getSelectedTerm();
+
+        return selected == -1 ? Constants.TERMS[0] : Constants.TERMS[selected];
+    }
+
+    /**
+     * Get the end date of the selected term
+     */
+    static getTermEndDate()
+    {
+        let selected = Navigation.instance.getSelectedTerm();
+
+        return selected == -1 ? Constants.TERMS[4] : Constants.TERMS[selected + 1];
+    }
+}
@@ -1,21 +1,5 @@
-import moment from 'moment';
-
 export class FormatUtils
 {
-    /**
-     * Convert date format to yyyy-mm-dd
-     *
-     * @param _date Date
-     */
-    public static toChartDate(_date: string | Date)
-    {
-        // Convert to Date
-        let date: Date = _date instanceof Date ? _date : new Date(_date);
-
-        // Convert to yyyy-mm-dd
-        return moment(date).format('YYYY-MM-DD');
-    }
-
    /**
     * Limit string length
     *
@@ -37,4 +21,14 @@ export class FormatUtils
    {
        return str.replace(/\w\S*/g, s => s.charAt(0).toUpperCase() + s.substr(1).toLowerCase())
    }
+
+    /**
+     * Parse html text
+     *
+     * @param str
+     */
+    public static parseText(str: string): string
+    {
+        return str.replace(/&amp;/g, '&');
+    }
 }
@@ -0,0 +1,7 @@
+
+export function findLastIndex<T>(array: T[], callback: (v: T) => boolean): number
+{
+    let arr2 = array.slice().reverse();
+    let result = arr2.findIndex(callback);
+    return result == -1 ? -1 : arr2.length - result - 1;
+}
@@ -0,0 +1,189 @@
+import Course, {Assignment, Grading} from '@/logic/course';
+
+export interface Scale
+{
+    min: number
+    letter: string
+    gp: number
+}
+
+/**
+ * This is an utility class to calculate GPA.
+ */
+export class GPAUtils
+{
+    // [[Min score, Letter grade, Base GPA], ...]
+    public static SCALE: Scale[] =
+    [
+        {min: 96.5, letter: 'A+', gp: 4.00},
+        {min: 92.5, letter: 'A' , gp: 3.75},
+        {min: 89.5, letter: 'A-', gp: 3.50},
+        {min: 86.5, letter: 'B+', gp: 3.25},
+        {min: 82.5, letter: 'B' , gp: 3.00},
+        {min: 79.5, letter: 'B-', gp: 2.75},
+        {min: 76.5, letter: 'C+', gp: 2.50},
+        {min: 72.5, letter: 'C' , gp: 2.25},
+        {min: 70.5, letter: 'C-', gp: 2.00},
+        {min: 69.5, letter: 'D' , gp: 1.00},
+        {min: 0   , letter: 'F' , gp: 0.00}
+    ];
+
+    /**
+     * Calculate GPA for a list of couses
+     *
+     * @param coursesOriginal List of courses
+     */
+    public static getGPA(coursesOriginal: Course[]): {gpa: number, accurate: boolean, max: number}
+    {
+        // Clone array
+        let courses: Course[] = [];
+
+        // Accurate or not
+        let accurate: boolean = true;
+
+        // Remove all courses that does not have a grade
+        coursesOriginal.forEach(course =>
+        {
+            if (course.letterGrade == null || course.letterGrade == '')
+            {
+                accurate = false;
+            }
+            else if (course.level != 'none' && !isNaN(course.numericGrade))
+            {
+                courses.push(course);
+            }
+        });
+
+        // If no course have grade, return -1
+        if (courses.length == 0)
+        {
+            return {gpa: -1, accurate: false, max: -1};
+        }
+
+        // Count total GPA
+        let totalGPA = 0;
+        let maxTotal = 0;
+        courses.forEach(course =>
+        {
+            totalGPA += this.getGP(course, course.numericGrade);
+            maxTotal += this.getGP(course, 'A+');
+        });
+
+        // Get average GPA, round to two decimal places
+        let gpa = Math.round(totalGPA / courses.length * 100) / 100;
+        let maxGPA = Math.round(maxTotal / courses.length * 100) / 100;
+
+        // Return results
+        return {gpa: gpa, accurate: accurate, max: maxGPA};
+    }
+
+    /**
+     * Calculate GPA for a course
+     *
+     * @param course Course
+     * @param letterGrade Letter grade
+     */
+    public static getGP(course: Course, letterGrade: string | number): number
+    {
+        // Get scale
+        let scale = this.findScale(letterGrade);
+
+        // No scale
+        if (scale == undefined) return -1;
+
+        // Add scaleUp if not failed.
+        return scale.gp == 0 ? 0 : scale.gp + course.scaleUp;
+
+    }
+
+    /**
+     * Find the scale for a grade
+     *
+     * @param grade Letter grade or numeric grade
+     */
+    public static findScale(grade: string | number): Scale | undefined
+    {
+        // Letter grade
+        if (typeof grade == 'string')
+        {
+            return this.SCALE.find(scale => scale.letter == grade);
+        }
+
+        // Numeric grade
+        return this.SCALE.find(scale => grade >= scale.min);
+    }
+
+    /**
+     * Calculate the total-mean (total/max) average
+     *
+     * @param assignments
+     */
+    public static getTotalMeanAverage(assignments: Assignment[])
+    {
+        let score = 0;
+        let max = 0;
+
+        // Loop through assignments
+        assignments.forEach(assignment =>
+        {
+            // If assignment should be displayed
+            if (!assignment.graded) return;
+
+            // Record scores
+            score += assignment.score;
+            max += assignment.scoreMax;
+        });
+
+        // Return
+        return +(score / max * 100).toFixed(2);
+    }
+
+    /**
+     * Calculate the percent type
+     *
+     * @param grading
+     * @param assignments
+     */
+    public static getPercentTypeAverage(grading: Grading, assignments: Assignment[])
+    {
+        let typeScores: {[index: string]: any} = {};
+        let typeCounts: {[index: string]: any} = {};
+
+        // Loop through assignments
+        assignments.forEach(assignment =>
+        {
+            // If assignment should be displayed
+            if (!assignment.graded) return;
+
+            // Record scores
+            if (typeScores[assignment.type] == undefined) typeScores[assignment.type] = 0;
+            typeScores[assignment.type] += assignment.score / assignment.scoreMax;
+
+            if (typeCounts[assignment.type] == undefined) typeCounts[assignment.type] = 0;
+            typeCounts[assignment.type] ++;
+        });
+
+        // Count total percentage (This is to avoid less than expected cases)
+        // Eg. If HW = 25% and Quiz = 75%, I have 1 hw and 0 quiz
+        // Without total percentage, the avg grade I get is 25%.
+        let totalPercentage = 0;
+        for (let type in grading.weightingMap)
+        {
+            if (typeScores[type] != undefined)
+            {
+                totalPercentage += grading.weightingMap[type];
+            }
+        }
+
+        // Count
+        let score = 0;
+        for (let type in typeScores)
+        {
+            let typeFactor = grading.weightingMap[type] / totalPercentage;
+            score += typeScores[type] * typeFactor / typeCounts[type];
+        }
+
+        // Add average to the row
+        return +(score * 100).toFixed(2);
+    }
+}
@@ -0,0 +1,103 @@
+import Constants from '@/constants';
+import App from '@/components/app/app';
+
+export default class GraphUtils
+{
+    static DOT = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:9px;height:9px;background-color:{color}"></span>';
+
+    /**
+     * Base settings
+     *
+     * @param title
+     * @param subtitle
+     */
+    static getBaseSettings(title?: String, subtitle?: String)
+    {
+        return {
+            // Color
+            color: Constants.THEME.colors,
+            backgroundColor: 'transparent',
+
+            // Title
+            title:
+            {
+                show: title != null,
+                textStyle:
+                {
+                    fontSize: 13
+                },
+                text: title,
+                subtext: subtitle,
+                x: 'center'
+            },
+        }
+    }
+
+    /**
+     * Get term mark lines
+     */
+    static getTermLines()
+    {
+        return {
+            silent: true,
+            symbol: 'none',
+            lineStyle: {color: Constants.THEME.colors[2]},
+            animationDuration: 500,
+            data: Constants.TERMS.map((term, index) =>
+            {
+                return {xAxis: term.getTime(), label: {formatter: `Term ${index + 1}`}}
+            })
+        }
+    }
+
+    /**
+     * Get mark areas for percentage scores
+     */
+    static getGradeMarkAreas(opacity: number)
+    {
+        // TODO: Auto update after switching dark mode (possibly by refreshing)
+        opacity = App.instance.darkMode ? 0.1 : opacity;
+
+        return {
+            silent: true,
+            data:
+            [
+                // Above 100
+                [{itemStyle: {color: 'rgba(230,253,255)', opacity: opacity}, yAxis: 120}, {yAxis: 100}],
+                // 90 to 100
+                [{itemStyle: {color: 'rgba(241,255,237)', opacity: opacity}, yAxis: 100}, {yAxis: 90}],
+                // 80 to 90
+                [{itemStyle: {color: 'rgba(255,250,216)', opacity: opacity}, yAxis: 90}, {yAxis: 80}],
+                // 70 to 80
+                [{itemStyle: {color: 'rgba(255,225,199)', opacity: opacity}, yAxis: 80}, {yAxis: 70}],
+                // Below 70 (Fail)
+                [{itemStyle: {color: 'rgb(255,190,184)', opacity: opacity}, yAxis: 70}, {yAxis: -100}]
+            ]
+        }
+    }
+
+    /**
+     * Text style for pie graphs or radar graphs
+     */
+    static pieTextStyle()
+    {
+        return {
+            fontSize: 14,
+            textShadowColor: '#cfcfcf',
+            textShadowBlur: 2,
+            textShadowOffsetX: 1,
+            textShadowOffsetY: 1,
+            backgroundColor: '#f6f6f6',
+            borderRadius: 3,
+            padding: [3, 5]
+        }
+    }
+
+    /**
+     * CSS shadow string (extraCssText) for tooltip
+     */
+    static tooltipCssShadow()
+    {
+        return {extraCssText: 'box-shadow: 0 0 3px rgba(0, 0, 0, 0.3);'}
+    }
+}
@@ -1,13 +1,14 @@
 import Constants from '@/constants';
+import LoginUser from '@/logic/login-user';

 export class HttpUtils
 {
-    public token: string = '';
+    public user: LoginUser;

    public post(node: string, body: any): Promise<any>
    {
        // Add token
-        if (this.token != '') body['token'] = this.token;
+        if (this.user != null) body['token'] = this.user.token;

        // Create promise
        return new Promise<any>((resolve, reject) =>
@@ -1,10 +1,10 @@
 import Vue from 'vue';
 import ElementUI from 'element-ui';
-const VCharts = require('v-charts');
-
 import App from './components/app/app.vue';
 import VueCookies from 'vue-cookies';

+const VCharts = require('v-charts');
+
 Vue.config.productionTip = false;

 // Use Element UI
@@ -0,0 +1,79 @@
+<template>
+    <div id="assignment-type-head">
+        <el-card :body-style="{padding: '0px'}">
+            <div id="type-info-card">
+                <span id="type-name">{{type.name}}</span>
+                <span id="type-average">Average: {{type.percent}}%</span>
+            </div>
+
+            <AssignmentEntry v-for="(assignment, index) of filteredAssignments" :key="assignment.id"
+                             :assignment="assignment" :unread="false"
+                             :backgroundColor="index % 2 === 1 ? '#ffffff' : '#f7f7f7'" narrow="true">
+            </AssignmentEntry>
+        </el-card>
+    </div>
+</template>
+
+<script lang="ts">
+    import {Component, Prop, Vue} from 'vue-property-decorator';
+    import AssignmentEntry from '@/pages/overall/overall-course/assignment-entry/assignment-entry.vue';
+    import {Assignment, AssignmentType} from '@/logic/course';
+
+    @Component({
+        components: {AssignmentEntry}
+    })
+    export default class AssignmentTypeHead extends Vue
+    {
+        @Prop({required: true}) type: AssignmentType;
+        @Prop({required: true}) assignments: Assignment[];
+
+        get filteredAssignments()
+        {
+            // Filter assignments to only this type
+            return this.assignments.filter(a => a.typeId == this.type.id);
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    #assignment-type-head
+    {
+        margin-bottom: 20px;
+    }
+
+    #type-info-card
+    {
+        height: 60px;
+    }
+
+    #type-name
+    {
+        // Font
+        font-size: 22px;
+        color: var(--main);
+
+        // Center
+        height: 60px;
+        line-height: 60px;
+
+        // Alignment
+        padding-left: 20px;
+        float: left;
+    }
+
+    #type-average
+    {
+        // Font
+        font-size: 14px;
+        color: #8db3e4;
+
+        // Center
+        height: 60px;
+        line-height: 64px;
+
+        // Alignment
+        float: left;
+        margin-left: 15px;
+        display: inline-block;
+    }
+</style>
@@ -18,3 +18,9 @@
    // https://stackoverflow.com/questions/17572619/inset-box-shadow-only-on-one-side
    box-shadow: inset 0 7px 9px -7px rgba(0,0,0,0.1);
 }
+
+.type-graph
+{
+    padding-top: 23px;
+    height: 420px !important;
+}
@@ -1,29 +0,0 @@
-import {Component, Prop, Vue} from 'vue-property-decorator';
-import {Assignment, Course} from '@/components/app/app';
-import CourseHead from '@/pages/overall/overall-course/course-head/course-head.vue';
-import CourseScatter from '@/pages/course/course-scatter/course-scatter';
-
-@Component({
-    components: {CourseHead, CourseScatter}
-})
-export default class CoursePage extends Vue
-{
-    // @ts-ignore
-    @Prop({required: true}) course: Course;
-
-    private unread: number = -1;
-    private unreadAssignments: Assignment[] = [];
-
-    /**
-     * Count the number of unread assignments with cache
-     */
-    countUnread(): number
-    {
-        if (this.unread == -1)
-        {
-            this.unreadAssignments = this.course.assignments.filter(a => a.unread);
-            return this.unread = this.unreadAssignments.length;
-        }
-        else return this.unread;
-    }
-}
@@ -1,21 +1,71 @@
 <template>
    <el-card id="course-card" class="course-card">
-        <course-head :course="course" :unread="countUnread()"></course-head>
+        <course-head :clickable="false" :course="course" :unread="countUnread()"/>

        <div class="course-card-content expand">
            <el-row>
-                <el-col :span="24">
+                <el-col :span="24" class="course-page-graph">
                    <el-card class="large overall-line-card vertical-center">
-                        <course-scatter :course="course"></course-scatter>
+                        <course-scatter :course="course"/>
                    </el-card>
                </el-col>
-                <el-col :span="0">
+            </el-row>

+            <el-row>
+                <el-col :span="12" class="course-page-graph">
+                    <el-card class="large overall-line-card vertical-center type-graph"
+                             body-style="padding: 0">
+                        <TypeRadar :course="course"/>
+                    </el-card>
+                </el-col>
+                <el-col :span="12" class="course-page-graph">
+                    <el-card class="large overall-line-card vertical-center type-graph"
+                             body-style="padding: 0">
+                        <TypePie :course="course"/>
+                    </el-card>
                </el-col>
            </el-row>
+
+            <AssignmentTypeHead v-for="type in course.assignmentTypes" :key="type.id"
+                                :type="type" :assignments="course.assignments">
+            </AssignmentTypeHead>
        </div>
    </el-card>
 </template>

-<script src="./course-page.ts" lang="ts"></script>
-<style src="./course-page.scss" lang="scss" scoped></style>
+<script lang="ts">
+    import {Component, Prop, Vue} from 'vue-property-decorator';
+    import CourseHead from '@/pages/overall/overall-course/course-head/course-head.vue';
+    import CourseScatter from '@/pages/course/course-scatter/course-scatter';
+    import AssignmentEntry from '@/pages/overall/overall-course/assignment-entry/assignment-entry.vue';
+    import AssignmentTypeHead from '@/pages/course/assignment-type-head/assignment-type-head.vue';
+    import Course, {Assignment} from '@/logic/course';
+    import TypeRadar from '@/pages/course/type-radar/type-radar';
+    import TypePie from '@/pages/course/type-pie/type-pie';
+
+    @Component({
+        components: {TypeRadar, TypePie, AssignmentEntry, CourseHead, CourseScatter, AssignmentTypeHead}
+    })
+    export default class CoursePage extends Vue
+    {
+        @Prop({required: true}) course: Course;
+
+        private unread: number = -1;
+        private unreadAssignments: Assignment[] = [];
+
+        /**
+         * Count the number of unread assignments with cache
+         */
+        countUnread(): number
+        {
+            if (this.unread == -1)
+            {
+                this.unreadAssignments = this.course.assignments.filter(a => a.unread);
+                return this.unread = this.unreadAssignments.length;
+            }
+            else return this.unread;
+        }
+    }
+</script>
+
+<style src="./course-page.scss" lang="scss" scoped/>
@@ -1,17 +1,14 @@
 import {Component, Prop, Vue} from 'vue-property-decorator';
-import {Assignment, Course} from '@/components/app/app';
-import {GPAUtils} from '@/utils/gpa-utils';
 import Constants from '@/constants';
-import {FormatUtils} from '@/utils/format-utils';
+import {FormatUtils} from '@/logic/utils/format-utils';
 import moment from 'moment';
+import Course, {Assignment} from '@/logic/course';
+import GraphUtils from '@/logic/utils/graph-utils';
+import chroma from 'chroma-js';

-@Component({
-})
+@Component
 export default class CourseScatter extends Vue
 {
-    private static DOT = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:9px;height:9px;background-color:{color}"></span>';
-
-    // @ts-ignore
    @Prop({required: true}) course: Course;

    /**
@@ -29,40 +26,11 @@ export default class CourseScatter extends Vue
     */
    get chartSettings()
    {
-        // Map assignments
-        let map = this.mapAssignments();
-
-        // Scatter data point style
-        let itemStyle =
-        {
-            normal:
-            {
-                opacity: 0.8,
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowOffsetY: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.2)'
-            }
-        };
-
        // Create settings
        let settings =
        {
-            // Color
-            color: Constants.THEME.colors,
-
-            // Title
-            title:
-            {
-                show: true,
-                textStyle:
-                {
-                    fontSize: 13
-                },
-                text: 'Assignments',
-                subtext: 'Assignment scores for ' + this.course.name,
-                x: 'center'
-            },
+            // Base settings
+            ...GraphUtils.getBaseSettings('Assignments', 'Assignment scores for ' + this.course.name),

            // X axis represents course names
            xAxis:
@@ -72,7 +40,7 @@ export default class CourseScatter extends Vue
                {
                    formatter: (name: any) => moment(name).format('MMM DD')
                },
-                max: FormatUtils.toChartDate(new Date())
+                max: new Date().getTime()
            },

            // Y axis represents GPAs and MaxGPAs
@@ -86,21 +54,23 @@ export default class CourseScatter extends Vue
                {
                    formatter: (name: any) => name + '%'
                },
-                max: 100,
-                min: (value: any) => Math.floor(value.min) - 5
+                min: (value: any) => Math.floor(value.min) - 5,
+                max: (value: any) => Math.min(Math.ceil(value.max), 110)
            },

            // Tooltip
            tooltip:
            {
+                ...GraphUtils.tooltipCssShadow(),
+
                trigger: 'axis',
                axisPointer:
                {
                    type: 'cross'
                },
-                formatter: (ps: any[]) => ps[0].data[0] + '<br>' + ps.map(p =>
-                    `${CourseScatter.DOT.replace('{color}', p.color)}
-                    ${FormatUtils.limit(p.data[2], 22)}: ${p.data[1]}%<br>`).join('')
+                formatter: (ps: any[]) => moment(ps[0].data[0]).format('MMM DD, YYYY') + '<br>' + ps.map(p =>
+                        `${GraphUtils.DOT.replace('{color}', p.color.colorStops[1].color)}
+                        ${FormatUtils.limit(p.data[2].description, 22)}: ${p.data[1]}%<br>`).join('')
            },

            // Legend
@@ -116,39 +86,70 @@ export default class CourseScatter extends Vue
            },

            // Data
-            series: Array.from(map, ([type, assignments]) =>
-            {
-                return {
-                    type: 'scatter',
-                    name: type,
-                    data: CourseScatter.assignmentsData(assignments),
-                    itemStyle: itemStyle
-                }
-            })
+            series: this.series()
        };

        return settings;
    }

    /**
-     * Map assignments to {assignmentType, [assignment]} format.
+     * Get series data
     */
-    private mapAssignments(): Map<string, Assignment[]>
+    private series()
    {
-        // Define map
-        let map = new Map();
-
-        // Move data to map
-        this.course.assignments.forEach(a =>
+        // Create scatter plots
+        let series: any[] = this.course.assignmentTypes.map((type, i) =>
        {
-            // Null case, create empty array
-            if (!map.has(a.type)) map.set(a.type, []);
+            return {
+                type: 'scatter',
+                name: type.name,
+                data: CourseScatter.assignmentsData(this.course.assignments.filter(a => a.typeId == type.id)),
+                symbolSize: (data: any) => Math.max(Math.sqrt(type.weight * data[2].scoreMax / type.scoreMax) * 12, 12),

-            // Put data
-            map.get(a.type).push(a);
+                label:
+                {
+                    emphasis:
+                    {
+                        show: true,
+                        formatter: (p: any) => p.data[2].description,
+                        position: 'top'
+                    }
+                },
+
+                itemStyle:
+                {
+                    normal:
+                    {
+                        opacity: 0.7,
+                        shadowBlur: 10,
+                        shadowOffsetX: 0,
+                        shadowOffsetY: 0,
+                        shadowColor: 'rgba(0, 0, 0, 0.2)',
+                        color:
+                        {
+                            type: 'radial',
+                            x: 0.4,
+                            y: 0.3,
+                            colorStops:
+                            [
+                                {offset: 0, color: chroma(Constants.THEME.colors[i]).set('hsl.l', 0.9).css()},
+                                {offset: 1, color: Constants.THEME.colors[i]}
+                            ]
+                        }
+                    }
+                }
+            }
        });

-        return map;
+        // Push other stuff
+        series.push(
+        {
+            type: 'line',
+            markLine: GraphUtils.getTermLines(),
+            markArea: GraphUtils.getGradeMarkAreas(0.4)
+        });
+
+        return series;
    }

    /**
@@ -159,6 +160,6 @@ export default class CourseScatter extends Vue
    private static assignmentsData(assignments: Assignment[])
    {
        return assignments.filter(a => a.complete == 'Complete')
-            .map(a => [FormatUtils.toChartDate(a.date), (a.score / a.scoreMax * 100).toFixed(2), a.description]);
+            .map(a => [a.time, (a.score / a.scoreMax * 100).toFixed(2), a]);
    }
 }
@@ -1,16 +1,7 @@
 <template>
    <div id="course-scatter">
-        <ve-scatter height="450px" class="graph" :extend="{heyIUsedCourseObject: this.course.name}" :after-config="afterConfig"></ve-scatter>
+        <ve-scatter height="450px" class="graph" :extend="{a: this.course.name}" :after-config="afterConfig"/>
    </div>
 </template>

 <script src="./course-scatter.ts" lang="ts"></script>
-<style lang="scss" scoped>
-    #overall-bar
-    {
-        .graph
-        {
-            margin-top: 50px;
-        }
-    }
-</style>
@@ -0,0 +1,56 @@
+import {Component, Prop, Vue} from 'vue-property-decorator';
+import Constants from '@/constants';
+import Course from '@/logic/course';
+import GraphUtils from '@/logic/utils/graph-utils';
+
+@Component
+export default class TypePie extends Vue
+{
+    @Prop({required: true}) course: Course;
+
+    /**
+     * Override options
+     *
+     * @param options Original options (Unused)
+     */
+    afterConfig(options: any)
+    {
+        return this.chartSettings;
+    }
+
+    /**
+     * Generate settings
+     */
+    get chartSettings()
+    {
+        // Create settings
+        let settings =
+        {
+            ...GraphUtils.getBaseSettings('Assignment Type Weight',
+                'How much each type of assignment affect your average'),
+
+            // Data
+            series:
+            {
+                type: 'pie',
+                avoidLabelOverlap: false,
+                radius: ['40%', '60%'],
+                center: ['50%', '55%'],
+                label: GraphUtils.pieTextStyle(),
+                data: this.course.assignmentTypes.map((t, i) => {return {
+                    value: t.weight,
+                    name: `${t.name}\n${t.weight}%`,
+                    itemStyle:
+                    {
+                        color: Constants.THEME.colors[i],
+                        opacity: 0.8,
+                        shadowColor: 'rgba(0,0,0,0.22)',
+                        shadowBlur: 10
+                    }
+                }}).sort((a, b) => a.value - b.value)
+            }
+        };
+
+        return settings;
+    }
+}
@@ -0,0 +1,8 @@
+<template>
+    <div id="type-pie">
+        <ve-pie height="420px" class="graph" :extend="{a: this.course.name}" :after-config="afterConfig"></ve-pie>
+    </div>
+</template>
+
+<script src="./type-pie.ts" lang="ts"></script>
+<style lang="scss" scoped></style>
@@ -0,0 +1,102 @@
+import {Component, Prop, Vue} from 'vue-property-decorator';
+import Constants from '@/constants';
+import Course from '@/logic/course';
+import GraphUtils from '@/logic/utils/graph-utils';
+
+@Component
+export default class TypeRadar extends Vue
+{
+    @Prop({required: true}) course: Course;
+
+    /**
+     * Override options
+     *
+     * @param options Original options (Unused)
+     */
+    afterConfig(options: any)
+    {
+        return this.chartSettings;
+    }
+
+    /**
+     * Generate settings
+     */
+    get chartSettings()
+    {
+        let min = this.course.assignmentTypes.reduce((min, t) => Math.min(min, t.percent), 100);
+
+        // Create settings
+        let settings =
+        {
+            ...GraphUtils.getBaseSettings('Assignment Type Radar',
+                'How are you doing for different types of assignment'),
+
+            // Radar settings
+            radar:
+            {
+                // shape: 'circle',
+                name:
+                {
+                    textStyle: GraphUtils.pieTextStyle()
+                },
+                splitArea:
+                {
+                    areaStyle:
+                    {
+                        color:
+                        [
+                            'rgb(255,161,151)',
+                            'rgb(255,190,184)',
+                            'rgba(255,225,199)',
+                            'rgba(255,250,216)',
+                            'rgba(241,255,237)',
+                        ],
+                        opacity: 0.4
+                    }
+                },
+                indicator: this.course.assignmentTypes.map((t, i) => {return {
+                    name: `${t.name}\n${t.percent}%`,
+                    max: 100,
+                    min: min - 30,
+                    color: Constants.THEME.colors[i]
+                }}),
+                radius: '60%',
+                center: ['50%', '55%']
+            },
+
+            // Data
+            series:
+            {
+                type: 'radar',
+                data:
+                [
+                    {
+                        name: 'Score',
+                        symbol: 'circle',
+                        areaStyle:
+                        {
+                            color:
+                            {
+                                type: 'radial',
+                                x: 0.5, y: 0.55, r: 0.5,
+                                colorStops:
+                                [
+                                    {offset: 0, color: '#ffa0a0'},
+                                    {offset: 0.5, color: '#fffead'},
+                                    {offset: 1, color: '#d1ffde'}
+                                ],
+                                global: false // 缺省为 false
+                            },
+                            opacity: 0.2
+                        },
+                        value: this.course.assignmentTypes.map(t => t.percent)
+                    }
+                ]
+            },
+
+            color: '#6771c1'
+        };
+
+        return settings;
+    }
+}
@@ -0,0 +1,7 @@
+<template>
+    <div id="type-radar">
+        <ve-radar height="420px" class="graph" :extend="{a: this.course.name}" :after-config="afterConfig"/>
+    </div>
+</template>
+
+<script src="./type-radar.ts" lang="ts"></script>
@@ -1,14 +1,12 @@
 import {Component, Prop, Vue} from 'vue-property-decorator';
-import {Course} from '@/components/app/app';
-import {GPAUtils} from '@/utils/gpa-utils';
+import Course from '@/logic/course';
+import {GPAUtils} from '@/logic/utils/gpa-utils';
 import Constants from '@/constants';
-import {FormatUtils} from '@/utils/format-utils';
+import {FormatUtils} from '@/logic/utils/format-utils';

-@Component({
-})
+@Component
 export default class OverallBar extends Vue
 {
-    // @ts-ignore
    @Prop({required: true}) courses: Course[];

    /**
@@ -54,15 +52,16 @@ export default class OverallBar extends Vue
            // Data
            series:
            [
+                // Max GP
                {
                    type: 'bar',
                    barGap: '-100%',
                    data: this.courses.map(course =>
                    {
-                        return {value: [course.name, GPAUtils.getGP(course, 'A+')],
-                            itemStyle: {color: '#d8d8d8'}}
+                        return {value: [course.name, GPAUtils.getGP(course, 'A+')], itemStyle: {color: '#d8d8d8'}}
                    }),
                },
+                // Current GP
                {
                    type: 'bar',
                    barGap: '-100%',
@@ -93,14 +92,21 @@ export default class OverallBar extends Vue
    {
        let data: any = [];

-        this.courses.forEach(course =>
+        this.courses.forEach((course, index) =>
        {
+            // Get GP
+            let gp = GPAUtils.getGP(course, course.letterGrade);
+
+            // No grade cases
+            if (gp == -1) return;
+
+            // Push data
            data.push(
            {
-                value: [course.name, GPAUtils.getGP(course, course.letterGrade)],
+                value: [course.name, gp],
                itemStyle:
                {
-                    color: Constants.THEME.colors[data.length]
+                    color: Constants.THEME.colors[index]
                }
            });
        });
@@ -1,7 +1,6 @@
 <template>
    <div id="overall-bar">
-        <ve-bar height="450px" class="graph"
-                :extend="chartSettings"></ve-bar>
+        <ve-bar height="450px" class="graph" :extend="chartSettings"/>
    </div>
 </template>

@@ -1,6 +1,6 @@

 // Row
-.unread-entry
+.assignment-entry
 {
    height: 40px;
    padding: 0 10px 0 20px;
@@ -11,11 +11,15 @@
    // Date
    .el-col.date
    {
-        min-width: 130px;
+        min-width: 150px;

        span.month
        {
            margin-right: 5px;
+
+            // Unified width
+            display: inline-block;
+            min-width: 50px;
        }

        span.now
@@ -53,6 +57,16 @@
        text-align: right;
        float: right;

+        // Fix smaller screen display issues.
+        width: unset;
+
+        // Status / Problems
+        span.status
+        {
+            margin-right: 8px;
+        }
+
+        // Percentage score
        span.percent
        {
            font-style: italic;
@@ -95,9 +109,40 @@
        height: 22px;
        padding: 0 5px;
    }
+
+    // Unified width
+    .entry-box.score, .entry-box.max
+    {
+        min-width: 30px;
+        display: inline-block;
+        text-align: center;
+    }
+
+    // Unified width
+    .entry-box.percent
+    {
+        min-width: 60px;
+        display: inline-block;
+        text-align: right;
+    }
 }

-.unread-entry:first-child
+// Narrow layout
+.assignment-entry.narrow
+{
+    height: 34px;
+}
+
+// Unread
+.no-unread
+{
+    visibility: hidden !important;
+    width: 0 !important;
+    margin-left: 0 !important;
+    padding: 0 0 0 10px !important;
+}
+
+.assignment-entry:first-child
 {
    padding-top: 3px;

@@ -0,0 +1,74 @@
+<template>
+    <div class="assignment-entry vertical-center"
+         :class="narrow ? 'narrow' : ''"
+         :style="`background: ${backgroundColor}`">
+
+        <el-row class="unread-row">
+            <el-col :span="3" class="date">
+                <span class="month">{{getMoment(assignment.time).format("MMM D")}}</span>
+                <span class="now">({{getMoment(assignment.time).fromNow()}})</span>
+            </el-col>
+
+            <el-col :span="15" class="description">
+                <span class="type entry-box"
+                      :style="`border-color: var(--assignment-type-${assignment.typeId})`">
+                    {{assignment.type}}
+                </span>
+                <span class="text">{{assignment.description}}</span>
+            </el-col>
+
+            <el-col :span="6" class="grade">
+                <span v-if="assignment.problem" class="status entry-box" :style="{color: assignment.problemColor}">
+                    {{assignment.problem}}
+                </span>
+                <span v-if="assignment.graded" class="percent entry-box">
+                    {{(assignment.score / assignment.scoreMax * 100).toFixed(1)}}
+                    <span class="symbol">%</span>
+                </span>
+                <span v-if="assignment.graded" class="score entry-box">{{assignment.score}}</span>
+                <span v-if="assignment.graded" class="max entry-box">{{assignment.scoreMax}}</span>
+
+                <el-button class="mark-as-read" :class="unread ? 'unread' : 'no-unread'"
+                           size="mini" type="text" icon="el-icon-close"
+                           @click="markAsRead">
+                </el-button>
+            </el-col>
+        </el-row>
+    </div>
+</template>
+
+<script lang="ts">
+    import {Component, Prop, Vue} from 'vue-property-decorator';
+    import moment from 'moment';
+    import {Assignment} from '@/logic/course';
+
+    @Component
+    export default class AssignmentEntry extends Vue
+    {
+        @Prop({required: true}) assignment: Assignment;
+
+        @Prop({default: false}) unread: boolean;
+        @Prop({default: '#f5f7fa'}) backgroundColor: string;
+        @Prop({default: false}) narrow: boolean;
+
+        /**
+         * Format a date to the displayed format
+         *
+         * @param date Date
+         */
+        getMoment(date: number)
+        {
+            return moment(new Date(date));
+        }
+
+        /**
+         * Mark this unread assignment as read
+         */
+        markAsRead()
+        {
+            // Call custom event
+            this.$emit('mark-as-read', this.assignment)
+        }
+    }
+</script>
+<style src="./assignment-entry.scss" lang="scss" scoped/>
@@ -0,0 +1,116 @@
+// Main card content
+.course-card-content.main
+{
+    // Main color
+    background: white;
+
+    // Alignment
+    display: block;
+
+    padding: 20px;
+    height: 50px;
+}
+
+#block-info
+{
+    // Align left
+    text-align: left;
+    float: left;
+
+    #name
+    {
+        overflow: hidden;
+        font-size: 22px;
+        color: var(--main);
+    }
+
+    #teacher
+    {
+        font-size: 12px;
+        color: #999999;
+        font-style: italic;
+    }
+}
+
+#block-grade
+{
+    // Align right
+    text-align: right;
+    float: right;
+
+    // Adjust position
+    margin-top: -2px;
+    margin-left: 10px;
+
+    #grade
+    {
+        font-size: 21px;
+    }
+
+    #updates
+    {
+        font-size: 14px;
+
+        #unread-number
+        {
+            display: inline-block;
+            width: 20px;
+            text-align: center;
+            border-radius: 5px;
+
+            padding-left: 3px;
+            padding-right: 3px;
+
+            margin-right: 3px;
+        }
+
+        #unread-text
+        {
+            font-style: italic;
+        }
+    }
+
+    #updates.unread
+    {
+        #unread-number
+        {
+            background: var(--unread);
+            color: white;
+        }
+
+        #unread-text
+        {
+            color: var(--unread);
+        }
+    }
+
+    #updates.none
+    {
+        color: #999999;
+        #unread-number
+        {
+            background: #eeeeee;
+        }
+    }
+}
+
+#block-term-grades
+{
+    // Align right
+    width: auto;
+    float: right;
+    margin-right: 10px;
+
+    color: gray;
+
+    #term, #term-numeric
+    {
+        font-size: 11px;
+        color: #b3b3b3;
+    }
+
+    #term-letter
+    {
+        font-size: 14px;
+    }
+}
@@ -1,47 +1,43 @@
 <template>
-    <div id="course-head" class="course-card-content main vertical-center">
-        <el-row>
-            <el-col :span="12" class="course-col-name">
-                <div v-if="clickable" class="course-name clickable" @click="redirect">{{course.name}}</div>
-                <div v-if="!clickable" class="course-name">{{course.name}}</div>
-                <div class="course-teacher">{{course.teacherName}}</div>
-            </el-col>
-            <el-col :span="12" class="course-col-grade">
-                <div class="course-grade">
-                    <span class="letter">{{course.letterGrade}} </span>
-                    <span class="numeric">{{course.numericGrade.toFixed(2)}}</span>
-                    <span class="percent">%</span>
-                </div>
-                <div class="course-updates" @click="redirect" :class="unread === 0 ? 'none' : 'unread'">
-                    <span class="unread-number">{{unread}}</span>
-                    <span class="unread-text" :class="clickable ? 'clickable' : ''">
-                        new update{{unread >= 2 ? 's' : ''}}
-                    </span>
-                </div>
-            </el-col>
-        </el-row>
+    <div id="course-head" class="course-card-content main vertical-center"
+         :class="clickable ? 'clickable' : ''" @click="redirect">
+        <div id="block-info">
+            <div id="name">{{course.name}}</div>
+            <div id="teacher">{{course.teacherName}}</div>
+        </div>
+        <div id="block-grade">
+            <div id="grade">
+                <span id="letter">{{course.letterGrade}} </span>
+                <span id="numeric">{{course.numericGrade === undefined ? '--' : course.numericGrade.toFixed(2)}}</span>
+                <span id="percent" v-if="course.numericGrade !== undefined">%</span>
+            </div>
+            <div id="updates" @click="redirect" :class="unread === 0 ? 'none' : 'unread'">
+                <span id="unread-number">{{unread}}</span>
+                <span id="unread-text" :class="clickable ? 'clickable' : ''">new update{{unread >= 2 ? 's' : ''}}</span>
+            </div>
+        </div>
+        <div id="block-term-grades" v-if="course.rawSelectedTerm === -1"
+             v-for="term in course.allGradingPeriods.slice().reverse()">
+            <div id="term">Term {{term + 1}}</div>
+            <div id="term-letter">{{course.letterGradeTerm(term)}}</div>
+            <div id="term-numeric">{{course.numericGradeTerm(term).toFixed(1)}}%</div>
+        </div>
    </div>
 </template>

 <script lang="ts">
    import {Component, Prop, Vue} from 'vue-property-decorator';
-    import App, {Course} from '@/components/app/app';
-    import {CourseUtils} from '@/utils/course-utils';
-    import Navigation from '@/components/navigation/navigation';
+    import Course from '@/logic/course';
+    import App from '@/components/app/app';

-    @Component({
-        components: {}
-    })
+    @Component
    export default class CourseHead extends Vue
    {
-        // @ts-ignore
-        @Prop() unread: number;
+        @Prop({required: true}) unread: number;

-        // @ts-ignore
-        @Prop() course: Course;
+        @Prop({required: true}) course: Course;

-        // @ts-ignore
-        @Prop() clickable: boolean;
+        @Prop({required: true}) clickable: boolean;

        /**
         * Redirect to the course page
@@ -49,102 +45,9 @@
        redirect()
        {
            if (!this.clickable) return;
-            Navigation.instance.updateIndex(CourseUtils.formatTabIndex(this.course));
+            App.instance.nav.updateIndex(this.course.urlIndex);
        }
    }
 </script>

-<style lang="scss">
-    // Main card content
-    .course-card-content.main
-    {
-        padding: 0 20px 0 20px;
-        height: 90px;
-
-        // Main color
-        background: white;
-    }
-
-    .course-col-name
-    {
-        // Align left
-        text-align: left;
-        float: left;
-
-        .course-name
-        {
-            overflow: hidden;
-            font-size: 22px;
-            color: var(--main);
-        }
-
-        .course-teacher
-        {
-            font-size: 12px;
-            color: #999999;
-            font-style: italic;
-        }
-    }
-
-    .course-col-grade
-    {
-        // Align right
-        text-align: right;
-        float: right;
-
-        // Adjust position
-        margin-top: -2px;
-
-        .course-grade
-        {
-            font-size: 21px;
-        }
-
-        .course-updates
-        {
-            font-size: 14px;
-
-            .unread-number
-            {
-                display: inline-block;
-                width: 20px;
-                text-align: center;
-                border-radius: 5px;
-
-                padding-left: 3px;
-                padding-right: 3px;
-
-                margin-right: 3px;
-            }
-
-            .unread-text
-            {
-                font-style: italic;
-            }
-        }
-
-        .course-updates.unread
-        {
-            .unread-number
-            {
-                background: var(--unread);
-                color: white;
-            }
-
-            .unread-text
-            {
-                color: var(--unread);
-            }
-        }
-
-        .course-updates.none
-        {
-            color: #999999;
-
-            .unread-number
-            {
-                background: #eeeeee;
-            }
-        }
-    }
-</style>
+<style src="./course-head.scss" lang="scss" scoped/>
@@ -1,53 +0,0 @@
-import {Component, Prop, Vue} from 'vue-property-decorator';
-import App, {Assignment, Course} from '@/components/app/app';
-import {GPAUtils} from '@/utils/gpa-utils';
-import Constants from '@/constants';
-import UnreadEntry from '@/pages/overall/overall-course/unread-entry/unread-entry';
-import CourseHead from '@/pages/overall/overall-course/course-head/course-head.vue';
-
-@Component({
-    components: {UnreadEntry, CourseHead}
-})
-export default class OverallCourse extends Vue
-{
-    // @ts-ignore
-    @Prop({required: true}) course: Course;
-
-    private unread: number = -1;
-    private unreadAssignments: Assignment[] = [];
-
-    /**
-     * Count the number of unread assignments with cache
-     */
-    countUnread(): number
-    {
-        if (this.unread == -1)
-        {
-            this.unreadAssignments = this.course.assignments.filter(a => a.unread);
-            return this.unread = this.unreadAssignments.length;
-        }
-        else return this.unread;
-    }
-
-    /**
-     * Mark an assignment as read
-     */
-    markAsRead(assignment: Assignment)
-    {
-        App.http.post('/mark-as-read', {scoreId: assignment.scoreId})
-        .then(response =>
-        {
-            // Check success
-            if (response.success)
-            {
-                this.unreadAssignments = this.unreadAssignments.filter(a => a != assignment);
-                this.unread = this.unreadAssignments.length;
-            }
-            else
-            {
-                // Show error message TODO: Show it properly
-                alert(response.data)
-            }
-        })
-    }
-}
@@ -1,18 +1,47 @@
 <template>
    <div id="overall-course">
        <el-card class="course-card">
-            <course-head :clickable="true" :course="course" :unread="countUnread()"></course-head>
+            <course-head :clickable="true" :course="course" :unread="unread()"/>
            <div class="course-card-content expand"
-                 v-if="countUnread() !== 0">
-                <unread-entry v-for="assignment in unreadAssignments"
+                 v-if="unread() !== 0">
+                <assignment-entry v-for="assignment in unreadAssignments()"
                              :assignment="assignment"
                              :key="assignment.id"
-                              v-on:mark-as-read="markAsRead">
-                </unread-entry>
+                              unread="true"
+                              v-on:mark-as-read="assignment.markAsRead()">
+                </assignment-entry>
            </div>
        </el-card>
    </div>
 </template>

-<script src="./overall-course.ts" lang="ts"></script>
-<style src="./overall-course.scss" lang="scss" scoped></style>
+<script lang="ts">
+    import {Component, Prop, Vue} from 'vue-property-decorator';
+    import AssignmentEntry from '@/pages/overall/overall-course/assignment-entry/assignment-entry.vue';
+    import CourseHead from '@/pages/overall/overall-course/course-head/course-head.vue';
+    import Course, {Assignment} from '@/logic/course';
+
+    @Component({
+        components: {AssignmentEntry, CourseHead}
+    })
+    export default class OverallCourse extends Vue
+    {
+        @Prop({required: true}) course: Course;
+
+        mounted()
+        {
+            this.unreadAssignments().forEach(a => a.addCallback(() => this.$forceUpdate()));
+        }
+
+        unreadAssignments(): Assignment[]
+        {
+            return this.course.assignments.filter(a => a.unread);
+        }
+
+        unread(): number
+        {
+            return this.unreadAssignments().length;
+        }
+    }
+</script>
+<style src="./overall-course.scss" lang="scss" scoped/>
@@ -1,30 +0,0 @@
-import {Component, Prop, Vue} from 'vue-property-decorator';
-import {Assignment, Course} from '@/components/app/app';
-import moment from 'moment';
-
-@Component({
-})
-export default class UnreadEntry extends Vue
-{
-    // @ts-ignore
-    @Prop({required: true}) assignment: Assignment;
-
-    /**
-     * Format a date to the displayed format
-     *
-     * @param date Date
-     */
-    getMoment(date: string)
-    {
-        return moment(new Date(date));
-    }
-
-    /**
-     * Mark this unread assignment as read
-     */
-    markAsRead()
-    {
-        // Call custom event
-        this.$emit('mark-as-read', this.assignment)
-    }
-}
@@ -1,31 +0,0 @@
-<template>
-    <div class="unread-entry vertical-center">
-        <el-row class="unread-row">
-            <el-col :span="3" class="date">
-                <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})`">
-                    {{assignment.type}}
-                </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)}}
-                    <span class="symbol">%</span>
-                </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">
-                </el-button>
-            </el-col>
-        </el-row>
-    </div>
-</template>
-
-<script src="./unread-entry.ts" lang="ts"></script>
-<style src="./unread-entry.scss" lang="scss" scoped></style>
@@ -1,180 +1,180 @@
 import {Component, Prop, Vue} from 'vue-property-decorator';
-import {Course} from '@/components/app/app';
+import moment from 'moment';
+import Course from '@/logic/course';
+import {CourseUtils} from '@/logic/utils/course-utils';
+import GraphUtils from '@/logic/utils/graph-utils';
+import {GPAUtils} from '@/logic/utils/gpa-utils';
+import Constants from '@/constants';
+import Navigation from '@/components/navigation/navigation';

-@Component({
-})
+@Component
 export default class OverallLine extends Vue
 {
-    // @ts-ignore
    @Prop({required: true}) courses: Course[];

-    private settings =
-    {
-        // Title
-        title:
-        {
-            show: true,
-            textStyle:
-            {
-                fontSize: 12
-            },
-            text: 'Average Grade',
-            subtext: 'Average score trend for every course',
-            x: 'center'
-        },
-        // Legend
-        legend:
-        {
-            show: false,
-            //left: 'auto',
-            //align: 'left',
-            //orient: 'vertical'
-            textStyle:
-            {
-                fontSize: 11
-            },
-            icon: 'circle'
-        },
-        // Zoom bar
-        dataZoom:
-        [
-            // TODO: Calculate real value for startValue
-            {
-                startValue: '9/13/2019'
-            },
-            {
-                type: 'inside'
-            }
-        ],
-        series:
-        {
-            smooth: true
-        },
-        xAxis:
-        {
-            //type: 'time'
-        },
-        yAxis:
-        {
-            min: (value: any) => Math.floor(value.min),
-            max: (value: any) => value.max
-        }
-    };
+    filteredCourses: Course[];
+    settings: any;

    /**
-     * Convert assignments list to a graph dataset.
+     * When this component is created
     */
-    get convertChart()
+    created()
    {
-        let courses = this.courses;
+        // Filter courses
+        this.filteredCourses = this.courses.filter(c => c.isGraded && c.assignments.length > 0);

-        // Compute the column names
-        let columns = courses.map(course => course.name);
-        columns.unshift('date');
-
-        // Find the min date
-        let minDates = courses.map(course => new Date(course.assignments[course.assignments.length - 1].date).getTime());
-        let minDate: Date = new Date(Math.min.apply(null, minDates));
-
-        // Find the dates in between
-        let now = new Date();
-        let dates = [];
-        for (let date = minDate; date <= now; date.setDate(date.getDate() + 1))
+        // Generate settings
+        this.settings =
        {
-            dates.push(new Date(date));
-        }
+            ...GraphUtils.getBaseSettings('Average Grade', 'Average score trend for every course'),

-        // Compute the rows data
-        let rows: {[index: string]: any}[] = [];
-        dates.forEach(date =>
-        {
-            // Define row object
-            let row: {[index: string]:any} = {'date': date.toLocaleDateString('en-US')};
+            // Zoom bar
+            dataZoom:
+            [
+                {
+                    type: 'slider',
+                    startValue: this.getStartDate(),

-            // Loop through courses
-            courses.forEach(course =>
+                    // Minimum zoom: 1 week
+                    minValueSpan: 7 * 24 * 60 * 60 * 1000
+                }
+            ],
+
+            // Tooltip
+            tooltip:
            {
-                // Total Mean
-                if (course.grading.method == 'TOTAL_MEAN')
+                ... GraphUtils.tooltipCssShadow(),
+
+                trigger: 'axis'
+            },
+
+            // Axis
+            xAxis:
+            {
+                type: 'time',
+                axisLabel:
                {
-                    let score = 0;
-                    let max = 0;
-
-                    // Loop through assignments
-                    course.assignments.forEach(assignment =>
-                    {
-                        // If assignment should be displayed
-                        if (assignment.complete != 'Complete') return;
-
-                        // Date is being looked at
-                        let assignmentDate = new Date(assignment.date);
-                        if (assignmentDate.getTime() < date.getTime())
-                        {
-                            // Record scores
-                            score += assignment.score;
-                            max += assignment.scoreMax;
-                        }
-                    });
-
-                    // Add average to the row
-                    row[course.name] = score / max * 100;
-                }
-                else if (course.grading.method == 'PERCENT_TYPE')
+                    formatter: (name: any) => moment(name).format('MMM DD')
+                },
+            },
+            yAxis:
+            {
+                axisLabel:
                {
-                    let typeScores: {[index: string]: any} = {};
-                    let typeCounts: {[index: string]: any} = {};
+                    formatter: (name: any) => name + '%'
+                },
+                min: (value: any) => Math.floor(value.min),
+                max: (value: any) => Math.min(Math.ceil(value.max), 110)
+            },

-                    // Loop through assignments
-                    course.assignments.forEach(assignment =>
-                    {
-                        // If assignment should be displayed
-                        if (assignment.complete != 'Complete') return;
-
-                        // Date is being looked at
-                        let assignmentDate = new Date(assignment.date);
-                        if (assignmentDate.getTime() < date.getTime())
-                        {
-                            // Record scores
-                            if (typeScores[assignment.type] == undefined) typeScores[assignment.type] = 0;
-                            typeScores[assignment.type] += assignment.score / assignment.scoreMax;
-
-                            if (typeCounts[assignment.type] == undefined) typeCounts[assignment.type] = 0;
-                            typeCounts[assignment.type] ++;
-                        }
-                    });
-
-                    // Count total percentage (This is to avoid less than expected cases)
-                    // Eg. If HW = 25% and Quiz = 75%, I have 1 hw and 0 quiz
-                    // Without total percentage, the avg grade I get is 25%.
-                    let totalPercentage = 0;
-                    for (let type in course.grading.weightingMap)
-                    {
-                        if (typeScores[type] != undefined)
-                        {
-                            totalPercentage += course.grading.weightingMap[type];
-                        }
-                    }
-
-                    // Count
-                    let score = 0;
-                    for (let type in typeScores)
-                    {
-                        let typeFactor = course.grading.weightingMap[type] / totalPercentage;
-                        score += typeScores[type] * typeFactor / typeCounts[type];
-                    }
-
-                    // Add average to the row
-                    if (score != 0) row[course.name] = score * 100;
-                }
-            });
-
-            // Add it to the array
-            rows.push(row);
-        });
-
-        return {
-            columns: columns,
-            rows: rows
+            // Series data
+            series: this.series()
        }
    }
+
+    /**
+     * Override options
+     *
+     * @param options Original options (Unused)
+     */
+    afterConfig(options: any)
+    {
+        return this.settings;
+    }
+
+    /**
+     * Get starting date
+     */
+    private getStartDate()
+    {
+        // If it's a past term, use the term's end date, else use today.
+        let selected = Navigation.instance.getSelectedTerm();
+        let end = selected == Constants.CURRENT_TERM || selected == -1
+            ? moment() : moment(CourseUtils.getTermEndDate());
+
+        return Math.max(end.subtract(30, 'days').toDate().getTime(),
+                CourseUtils.getTermBeginDate().getTime())
+    }
+
+    /**
+     * Generate series data
+     */
+    private series()
+    {
+        // Each course
+        let series: any[] = this.filteredCourses.map(course => this.getCourseSeries(course));
+
+        // Push other stuff
+        series.push(
+        {
+            type: 'line',
+            markLine: GraphUtils.getTermLines(),
+            markArea: GraphUtils.getGradeMarkAreas(0.4)
+        });
+
+        return series
+    }
+
+    /**
+     * Generate series data for a course
+     *
+     * @param course
+     */
+    private getCourseSeries(course: Course)
+    {
+        // Graded assignments
+        let assignments = course.assignments.slice().reverse();
+
+        // Create series
+        return {
+            name: course.name,
+            type: 'line',
+            smooth: true,
+            symbol: 'circle', // circle, diamond, emptyCircle, none
+            data: this.toDateRange([...new Set(assignments.map(a => a.time))].map(time =>
+            {
+                // Find subset before this assignment
+                let subset = course.getAssignmentsBefore(time);
+
+                // Find grade
+                if (course.termGrading[subset.term].method == 'PERCENT_TYPE')
+                    return [time, GPAUtils.getPercentTypeAverage(course.termGrading[subset.term], subset.assignments)];
+                else return [time, GPAUtils.getTotalMeanAverage(subset.assignments)];
+            }))
+        }
+    }
+
+    /**
+     * Convert point data to date range data.
+     * Eg. [[Mon, 10], [Wed, 5]] to [[Mon, 10], [Tue, 10], [Wed, 5]]
+     *
+     * @param data
+     */
+    private toDateRange(data: any[])
+    {
+        // Find the min date
+        let minDate: Date = new Date(data[0][0]);
+
+        // Find the dates in between
+        let now = new Date(Math.min(new Date().getTime(), CourseUtils.getTermEndDate().getTime()));
+        let times: number[] = [];
+        for (let date = minDate; date <= now; date.setDate(date.getDate() + 1)) times.push(date.getTime());
+
+        // Map the points
+        let lastValue: any = null;
+        return times.map(time =>
+        {
+            // Data point on this specific date
+            let thisValue = data.find(a => a[0] == time);
+
+            // Switching terms
+            if (Constants.TERMS.find(t => t.getTime() == time))
+                lastValue = null;
+
+            // Find value
+            return thisValue == null
+                ? lastValue == null ? null : [time, lastValue[1]]
+                : [time, (lastValue = thisValue)[1]];
+        });
+    }
 }
@@ -1,6 +1,6 @@
 <template>
    <div id="overall-line">
-        <ve-line :data="convertChart" :extend="settings"></ve-line>
+        <ve-line :extend="{a: this.courses}" :after-config="afterConfig"/>
    </div>
 </template>

@@ -34,9 +34,27 @@
    font-size: 11px;
 }

+.no-grade
+{
+    font-size: 30px;
+    color: #b1b1b1;
+
+    // Disable selecting
+    display:block;
+    pointer-events: none;
+    user-select: none;
+}
+
 // Cards
 .el-card.overall-bar-card
 {
    margin-right: 20px;
    min-width: 170px;
 }
+
+.dialog-checkbox
+{
+    display: block;
+    margin-top: 20px;
+    margin-bottom: -20px;
+}
@@ -1,24 +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
-{
-    // @ts-ignore
-    @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);
-    }
-}
@@ -1,8 +1,22 @@
 <template>
    <div id="overall">
-        <el-row>
-            <el-col :span="4">
-                <el-card class="large gpa-card vertical-center">
+        <el-progress v-if="started" :text-inside="true" :percentage="progress()"
+                     :stroke-width="20" status="success" style="margin: 0 20px"/>
+
+        <el-dialog title="Notice" :visible.sync="clearUnreadPrompt" @close="clearUnread(false)"
+                   width="30%" style="word-break: unset;">
+            <span>You have too many new grade notifications. Clear them now?</span>
+            <img src="./too-many-unread.png" alt=""/>
+            <el-checkbox class="dialog-checkbox" v-model="dontAskAgain">Don't Ask Again</el-checkbox>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="clearUnread(false)" style="float: left">Nope</el-button>
+                <el-button type="primary" @click="clearUnread(true)">Sure!</el-button>
+            </span>
+        </el-dialog>
+
+        <el-row v-if="getGPA().gpa !== -1">
+            <el-col :span="4" class="overall-span">
+                <el-card class="large gpa-card vertical-center" body-style="padding: 0">
                    <div style="padding: 14px;">
                        <span class="gpa header">GPA:</span>
                        <span class="gpa text">{{getGPA().gpa}}</span>
@@ -13,18 +27,24 @@
                    </div>
                </el-card>
            </el-col>
-            <el-col :span="14">
-                <el-card class="large overall-line-card vertical-center">
-                    <overall-line :courses="courses"></overall-line>
+            <el-col :span="14" class="overall-span">
+                <el-card class="large overall-line-card vertical-center" body-style="padding: 0 10px">
+                    <overall-line :courses="courses"/>
                </el-card>
            </el-col>
-            <el-col :span="6">
-                <el-card class="large overall-bar-card vertical-center">
-                    <overall-bar :courses="courses"></overall-bar>
+            <el-col :span="6" class="overall-span">
+                <el-card class="large overall-bar-card vertical-center" body-style="padding: 0 10px">
+                    <overall-bar :courses="courses"/>
                </el-card>
            </el-col>
        </el-row>

+        <el-row v-if="getGPA().gpa === -1">
+            <el-card class="large gpa-card vertical-center">
+                <div class="no-grade">This quarter has no grades yet...</div>
+            </el-card>
+        </el-row>
+
        <overall-course v-for="course in courses"
                        :course="course"
                        :key="course.id">
@@ -32,5 +52,93 @@
    </div>
 </template>

-<script src="./overall.ts" lang="ts"></script>
-<style src="./overall.scss" lang="scss" scoped></style>
+<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.vue';
+    import Course, {Assignment} from '@/logic/course';
+    import {GPAUtils} from '@/logic/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.
+         */
+        getGPA()
+        {
+            return GPAUtils.getGPA(this.courses);
+        }
+
+        // For clear unread prompt
+        unread: Assignment[];
+        clearUnreadPrompt = false;
+        dontAskAgain = false;
+        started = false;
+
+        /**
+         * Mark as read progress
+         */
+        progress()
+        {
+            return +(this.unread.filter(a => !a.unread).length / this.unread.length * 100).toFixed(1);
+        }
+
+        /**
+         * On page load - check if the user has too many notifications
+         */
+        mounted()
+        {
+            // Check unread
+            if (!this.$cookies.isKey('va.ignore-unread'))
+            {
+                // Count unread
+                this.unread = this.courses.flatMap(c => c.assignments.filter(a => a.unread));
+
+                // Prompt clear
+                if (this.unread.length > 15)
+                {
+                    this.clearUnreadPrompt = true;
+                }
+            }
+        }
+
+        /**
+         * Clear unread
+         *
+         * @param confirmed
+         */
+        clearUnread(confirmed: boolean)
+        {
+            // Hide prompt
+            this.clearUnreadPrompt = false;
+
+            // Not confirmed, do nothing
+            if (!confirmed)
+            {
+                if (!this.dontAskAgain) return;
+
+                // Don't ask again
+                this.$cookies.set('va.ignore-unread', true);
+                return;
+            }
+
+            // Clear unread
+            this.started = true;
+            this.unread.forEach((a, i) =>
+            {
+                // Delay: 100ms per assignment
+                // I don't want my server to explode lol
+                setTimeout(() => a.markAsRead().then(() => this.$forceUpdate()), 100 * i);
+            });
+        }
+    }
+</script>
+
+<style src="./overall.scss" lang="scss" scoped/>
@@ -1,4 +1,4 @@
-import Vue, { VNode } from 'vue';
+import Vue, {VNode} from 'vue';

 declare global {
  namespace JSX {
@@ -1,4 +1,5 @@
-declare module '*.vue' {
-  import Vue from 'vue';
-  export default Vue;
+declare module '*.vue'
+{
+    import Vue from 'vue';
+    export default Vue;
 }
@@ -0,0 +1,45 @@
+<template>
+    <div id="info">
+        <div id="top">
+            <div id="title">Veracross Analyzer for SJP</div>
+            <div id="subtitle">Know your grades better.</div>
+        </div>
+    </div>
+</template>
+
+<script lang="ts">
+    import {Component, Vue} from 'vue-property-decorator';
+
+    @Component
+    export default class Info extends Vue
+    {
+
+    }
+</script>
+
+<style lang="scss" scoped>
+    #top
+    {
+        padding: 40vh 0;
+
+        // Center and scale the image nicely
+        background-position: center;
+        background-repeat: no-repeat;
+        background-size: cover;
+
+        text-align: right;
+
+        #title
+        {
+            font-size: 30px;
+            margin-right: 10vw;
+            color: white;
+        }
+
+        #subtitle
+        {
+            margin-right: 10vw;
+            color: white;
+        }
+    }
+</style>
@@ -1,48 +0,0 @@
-import {Course} from '@/components/app/app';
-
-export class CourseUtils
-{
-    /**
-     * Return a list of courses that are graphed
-     *
-     * @param original Original course list
-     * @return Course[] Filtered course list
-     */
-    public static getGradedCourses(original: Course[]): Course[]
-    {
-        // Define result
-        let result: Course[] = [];
-
-        // Filter through courses
-        original.forEach(course =>
-        {
-            // Skip future or past courses
-            if (course.status != 'active') return;
-
-            // Skip courses without levels
-            if (course.level == 'None') return;
-
-            // Skip courses without graded assignments
-            if (course.assignments.filter(a => a.complete == 'Complete').length == 0) return;
-            
-            // Skip if there are no grading scale
-            // if (course.grading.method == 'NOT_GRADED') return;
-
-            // Add it to the list
-            result.push(course);
-        });
-
-        return result;
-    }
-
-    /**
-     * Format course to tab index string
-     *
-     * @param course Course object
-     * @return string Tab index
-     */
-    public static formatTabIndex(course: Course): string
-    {
-        return `course/${course.id}/${course.name.toLowerCase().split(' ').join('-')}`;
-    }
-}
@@ -1,130 +0,0 @@
-/**
- * This is an utility class to calculate GPA.
- */
-import {Course} from '@/components/app/app';
-
-export class GPAUtils
-{
-    // [[Min score, Letter grade, Base GPA], ...]
-    public static SCALE =
-    [
-        [96.5, 'A+', 4.00],
-        [92.5, 'A' , 3.75],
-        [89.5, 'A-', 3.50],
-        [86.5, 'B+', 3.25],
-        [82.5, 'B' , 3.00],
-        [79.5, 'B-', 2.75],
-        [76.5, 'C+', 2.50],
-        [72.5, 'C' , 2.25],
-        [70.5, 'C-', 2.00],
-        [69.5, 'D' , 1.00],
-        [0   , 'F' , 0.00]
-    ];
-
-    // Keywords
-    public static MIN = 0;
-    public static LETTER = 1;
-    public static GPA = 2;
-
-    /**
-     * Calculate GPA for a list of couses
-     *
-     * @param coursesOriginal List of courses
-     */
-    public static getGPA(coursesOriginal: Course[]): {gpa: number, accurate: boolean, max: number}
-    {
-        // Clone array
-        let courses: Course[] = [];
-
-        // Accurate or not
-        let accurate: boolean = true;
-
-        // Remove all courses that does not have a grade
-        coursesOriginal.forEach(course =>
-        {
-            if (course.letterGrade == null || course.letterGrade == '')
-            {
-                accurate = false;
-            }
-            else if (course.level != 'none')
-            {
-                courses.push(course);
-            }
-        });
-
-        // If no course have grade, return -1
-        if (courses.length == 0)
-        {
-            return {gpa: -1, accurate: false, max: -1};
-        }
-
-        // Count total GPA
-        let totalGPA = 0;
-        let maxTotal = 0;
-        courses.forEach(course =>
-        {
-            totalGPA += this.getGP(course, course.letterGrade);
-            maxTotal += this.getGP(course, 'A+');
-        });
-
-        // Get average GPA, round to two decimal places
-        let gpa = Math.round(totalGPA / courses.length * 100) / 100;
-        let maxGPA = Math.round(maxTotal / courses.length * 100) / 100;
-
-        // Return results
-        return {gpa: gpa, accurate: accurate, max: maxGPA};
-    }
-
-    /**
-     * Calculate GPA for a course
-     *
-     * @param course Course
-     * @param letterGrade Letter grade
-     */
-    public static getGP(course: Course, letterGrade?: string): number
-    {
-        // Find the GPA for this course.
-        for (let scale of this.SCALE)
-        {
-            // Letter grades are the same
-            if (scale[this.LETTER] == letterGrade)
-            {
-                // Get grade and add it
-                let grade = <number> scale[this.GPA];
-
-                // Add scaleUp if not failed.
-                if (grade != 0) grade += course.scaleUp;
-
-                // That's it
-                return grade;
-            }
-        }
-
-        return -1;
-    }
-
-    /**
-     * Calculate the total-mean (total/max) average
-     *
-     * @param course Course
-     */
-    public static getTotalMeanAverage(course: Course)
-    {
-        let score = 0;
-        let max = 0;
-
-        // Loop through assignments
-        course.assignments.forEach(assignment =>
-        {
-            // If assignment should be displayed
-            if (assignment.complete != 'Complete') return;
-
-            // Record scores
-            score += assignment.score;
-            max += assignment.scoreMax;
-        });
-
-        // Return
-        return score / max * 100;
-    }
-}
@@ -1,38 +0,0 @@
-import {Assignment} from '@/components/app/app';
-
-export default class JsonUtils
-{
-    /**
-     * This method filters the information provided in an assignments json.
-     *
-     * @param assignments Assignments object
-     * @returns Assignment[] Filtered assignment grade object list
-     */
-    public static filterAssignments(assignments: any): Assignment[]
-    {
-        let result: Assignment[] = [];
-
-        assignments.assignments.forEach((assignment: any) =>
-        {
-            result.push(
-            {
-                id: assignment.assignment_id,
-                scoreId: assignment.score_id,
-                type: assignment.assignment_type,
-                typeId: assignment.assignment_type_id,
-                description: assignment.assignment_description,
-                date: assignment._date,
-                complete: assignment.completion_status,
-                include: assignment.include_in_calculated_grade == 1,
-                display: assignment.display_grade == 1,
-
-                unread: assignment.is_unread == 1,
-
-                scoreMax: assignment.maximum_score,
-                score: +assignment.raw_score
-            });
-        });
-
-        return result;
-    }
-}
@@ -15,16 +15,17 @@
      "webpack-env"
    ],
    "paths": {
-      "@/*": [
-        "src/*"
-      ]
+      "@/*": ["src/*"]
    },
    "lib": [
      "esnext",
      "dom",
      "dom.iterable",
      "scripthost"
-    ]
+    ],
+
+    // Custom
+    "strictPropertyInitialization": false
  },
  "include": [
    "src/**/*.ts",
@@ -2,7 +2,9 @@
  "defaultSeverity": "warning",
  "linterOptions": {
    "exclude": [
-      "node_modules/**"
+      "node_modules/**",
+      "*.json",
+      "**/*.json"
    ]
  },
  "rules": {