From 3575db818210f675d16ed33e59111098b1d7d45a Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 08:01:36 -0400
Subject: [PATCH 01/89] [+] Create css class for input error

---
 src/components/login/login.scss | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/components/login/login.scss b/src/components/login/login.scss
index 45f0367..2b2b84f 100644
--- a/src/components/login/login.scss
+++ b/src/components/login/login.scss
@@ -72,3 +72,19 @@
         width: 100%;
     }
 }
+
+// Error
+.input-error
+{
+    .el-input__inner
+    {
+        color: #ff3a3a6b !important;
+        border-color: #ff3a3a6b !important;
+        background-color: #ffdddd3b !important;
+    }
+
+    .el-input__inner:focus
+    {
+        background-color: white !important;
+    }
+}

From 0296b2151a75d3fa8d90f1fd2fe1cc94c71daf22 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 08:01:49 -0400
Subject: [PATCH 02/89] [+] Create error message field

---
 src/components/login/login.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/login/login.ts b/src/components/login/login.ts
index 91ca99b..095b540 100644
--- a/src/components/login/login.ts
+++ b/src/components/login/login.ts
@@ -13,6 +13,7 @@ export default class Login extends Vue
     public password: any = '';
 
     public loading: boolean = false;
+    public error: String = 'asdf';
 
     /**
      * On click, sends username and password to the server.

From 8eb2080f14025c1ccdd3e3c271acfbac96a9193a Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 08:02:22 -0400
Subject: [PATCH 03/89] [+] Add error class on error

---
 src/components/login/login.vue | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/components/login/login.vue b/src/components/login/login.vue
index 31d14aa..979d0fe 100644
--- a/src/components/login/login.vue
+++ b/src/components/login/login.vue
@@ -3,9 +3,20 @@
         <div class="login-vertical-center">
             <div class="login-panel">
                 <img alt="Vue logo" src="../../assets/logo.png">
+
                 <h1>Veracross Analyzer</h1>
-                <el-input v-model="username" placeholder="School Username"></el-input>
-                <el-input v-model="password" placeholder="Veracross Password" show-password=""></el-input>
+
+                <el-input v-model="username"
+                          placeholder="School Username"
+                          :class="{'input-error': error !== ''}">
+                </el-input>
+
+                <el-input v-model="password"
+                          placeholder="Veracross Password"
+                          show-password=""
+                          :class="{'input-error': error !== ''}">
+                </el-input>
+
                 <el-button plain type="primary" @click="onLoginClick" :loading="loading">Login</el-button>
             </div>
         </div>

From 5029555c21fbc160268c8cab3390484492dacde6 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 08:02:50 -0400
Subject: [PATCH 04/89] [U] Update api url

---
 src/constants.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/constants.ts b/src/constants.ts
index a946210..3fcdd29 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -7,5 +7,5 @@ export default class Constants
      * Base url for api access
      * TODO: Use https for actual usage
      */
-    public static API_URL: string = 'http://cn2.hydev.org:24021/api';
+    public static API_URL: string = 'https://va.hydev.org/api';
 }

From 9a752305e31553a6cc678ed096d4281c7fb64edf Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 08:23:34 -0400
Subject: [PATCH 05/89] [O] Fix error message styling

---
 src/components/login/login.scss | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/components/login/login.scss b/src/components/login/login.scss
index 2b2b84f..691774a 100644
--- a/src/components/login/login.scss
+++ b/src/components/login/login.scss
@@ -88,3 +88,12 @@
         background-color: white !important;
     }
 }
+
+// Fix error message
+.el-form-item__error.custom
+{
+    padding-top: 0;
+    position: relative;
+    top: auto;
+    float: left;
+}

From 67ec2b85b2e4693ec724bb0a009533e4cbc24f6d Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 08:24:16 -0400
Subject: [PATCH 06/89] [+] Create error message div

---
 src/components/login/login.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/login/login.vue b/src/components/login/login.vue
index 979d0fe..bd52eae 100644
--- a/src/components/login/login.vue
+++ b/src/components/login/login.vue
@@ -17,6 +17,8 @@
                           :class="{'input-error': error !== ''}">
                 </el-input>
 
+                <div class="el-form-item__error custom">{{error}}</div>
+
                 <el-button plain type="primary" @click="onLoginClick" :loading="loading">Login</el-button>
             </div>
         </div>

From c7d16a00e6a262c90c552a67e3919cfe44bcaf49 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 08:28:24 -0400
Subject: [PATCH 07/89] [+] Send username and password to api in body

---
 src/components/login/login.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/login/login.ts b/src/components/login/login.ts
index 095b540..da99423 100644
--- a/src/components/login/login.ts
+++ b/src/components/login/login.ts
@@ -24,7 +24,9 @@ export default class Login extends Vue
         this.loading = true;
 
         // Fetch request TODO: Add username and password when the https server is ready.
-        fetch(`${Constants.API_URL}/veracross/courses`).then(res =>
+        fetch(`${Constants.API_URL}/api/login`,
+            {body: JSON.stringify({username: this.username, password: this.password})})
+        .then(res =>
         {
             // Get response body text
             res.text().then(text =>

From 805ffaa50e4d945ba69d22bb336b47b5a75a0593 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 08:28:54 -0400
Subject: [PATCH 08/89] [+] Check the success flag in response

---
 src/components/login/login.ts | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/components/login/login.ts b/src/components/login/login.ts
index da99423..12a244f 100644
--- a/src/components/login/login.ts
+++ b/src/components/login/login.ts
@@ -31,8 +31,20 @@ export default class Login extends Vue
             // Get response body text
             res.text().then(text =>
             {
-                // Call custom event with courses info
-                this.$emit('login:courses', JSON.parse(text));
+                // Parse response
+                let response = JSON.parse(text);
+
+                // Check success
+                if (response.success)
+                {
+                    // Call custom event with courses info
+                    this.$emit('login:token', response.token);
+                }
+                else
+                {
+                    // Allow the user to retry
+                    this.loading = false;
+                }
             })
         })
         .catch(err =>

From 75f9dc98499adfc399069bcec39108ec3ecb1ce4 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 08:31:32 -0400
Subject: [PATCH 09/89] [U] Remove testing error text

---
 src/components/login/login.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/login/login.ts b/src/components/login/login.ts
index 12a244f..d9bda7f 100644
--- a/src/components/login/login.ts
+++ b/src/components/login/login.ts
@@ -13,7 +13,7 @@ export default class Login extends Vue
     public password: any = '';
 
     public loading: boolean = false;
-    public error: String = 'asdf';
+    public error: String = '';
 
     /**
      * On click, sends username and password to the server.

From 8860c88b1ae492eda420e0719587b565db68213f Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 09:09:50 -0400
Subject: [PATCH 10/89] [F] Fix HTTP GET can't have body

---
 src/components/login/login.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/login/login.ts b/src/components/login/login.ts
index d9bda7f..a4ec4fc 100644
--- a/src/components/login/login.ts
+++ b/src/components/login/login.ts
@@ -25,7 +25,7 @@ export default class Login extends Vue
 
         // Fetch request TODO: Add username and password when the https server is ready.
         fetch(`${Constants.API_URL}/api/login`,
-            {body: JSON.stringify({username: this.username, password: this.password})})
+            {method: 'POST', body: JSON.stringify({username: this.username, password: this.password})})
         .then(res =>
         {
             // Get response body text

From 38089c74b5323b87520ad57021f9cda934cea54e Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 09:13:11 -0400
Subject: [PATCH 11/89] [F] Fix duplicate "/api/" in path

---
 src/components/login/login.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/login/login.ts b/src/components/login/login.ts
index a4ec4fc..8422194 100644
--- a/src/components/login/login.ts
+++ b/src/components/login/login.ts
@@ -24,7 +24,7 @@ export default class Login extends Vue
         this.loading = true;
 
         // Fetch request TODO: Add username and password when the https server is ready.
-        fetch(`${Constants.API_URL}/api/login`,
+        fetch(`${Constants.API_URL}/login`,
             {method: 'POST', body: JSON.stringify({username: this.username, password: this.password})})
         .then(res =>
         {

From 2338e4f6afd9f7ba63b957765f091a75ec065a6a Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 09:14:13 -0400
Subject: [PATCH 12/89] [+] Show error message on error

---
 src/components/login/login.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/login/login.ts b/src/components/login/login.ts
index 8422194..0879d78 100644
--- a/src/components/login/login.ts
+++ b/src/components/login/login.ts
@@ -42,6 +42,9 @@ export default class Login extends Vue
                 }
                 else
                 {
+                    // Show error message
+                    this.error = response.token;
+
                     // Allow the user to retry
                     this.loading = false;
                 }

From 3ce21623d8b69466b5c4fc95efe9bfae626033c1 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 09:21:29 -0400
Subject: [PATCH 13/89] [+] Import vue-cookies

---
 package-lock.json | 5 +++++
 package.json      | 1 +
 2 files changed, 6 insertions(+)

diff --git a/package-lock.json b/package-lock.json
index a3d4fc7..735f25d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10848,6 +10848,11 @@
       "resolved": "https://registry.npm.taobao.org/vue-class-component/download/vue-class-component-7.1.0.tgz",
       "integrity": "sha1-sz78sQ4XI21oT3Cx6W8ZRux5Poc="
     },
+    "vue-cookies": {
+      "version": "1.5.13",
+      "resolved": "https://registry.npmjs.org/vue-cookies/-/vue-cookies-1.5.13.tgz",
+      "integrity": "sha512-8pjpXnvbNWx1Lft0t3MJnW+ylv0Wa2Tb6Ch617u/pQah3+SfXUZZdkh3EL3bSpe/Sw2Wdw3+DhycgQsKANSxXg=="
+    },
     "vue-hot-reload-api": {
       "version": "2.3.3",
       "resolved": "https://registry.npm.taobao.org/vue-hot-reload-api/download/vue-hot-reload-api-2.3.3.tgz",
diff --git a/package.json b/package.json
index e956b28..2117965 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
     "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"
   },
   "devDependencies": {

From 4782870d94a9de41cd517d67c63e85b1f94ae793 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 09:21:57 -0400
Subject: [PATCH 14/89] [+] Add vue-cookies to Vue.use()

---
 src/main.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main.ts b/src/main.ts
index 2f5c043..f486226 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -3,6 +3,7 @@ import ElementUI from 'element-ui';
 const VCharts = require('v-charts');
 
 import App from './components/app/app.vue';
+import VueCookies from 'vue-cookies';
 
 Vue.config.productionTip = false;
 
@@ -12,6 +13,9 @@ Vue.use(ElementUI, {locale: 'en-us'});
 // Use VCharts
 Vue.use(VCharts);
 
+// Use Cookies
+Vue.use(VueCookies);
+
 // Init app
 new Vue({
   render: (h) => h(App),

From 446ed686bdbfa8e8accc470f1db07d1a29a7dd9f Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 10:05:53 -0400
Subject: [PATCH 15/89] [+] Create splash ascii art

---
 src/constants.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/constants.ts b/src/constants.ts
index 3fcdd29..b21ec85 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -8,4 +8,8 @@ export default class Constants
      * TODO: Use https for actual usage
      */
     public static API_URL: string = 'https://va.hydev.org/api';
+
+    public static SPLASH: string = '\\  /   /\\ ._  _.|  _  _ ._\n' +
+                                   ' \\/>< /--\\| |(_||\\//_(/_| \n' +
+                                   '    v0.1.1.0     /        '
 }

From 9038a73678b0eaadf8c25c0ec27491e068256d4f Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 10:06:19 -0400
Subject: [PATCH 16/89] [+] Save cookies on login

---
 src/components/app/app.ts  | 15 +++++++++++++--
 src/components/app/app.vue |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/components/app/app.ts b/src/components/app/app.ts
index ca45f70..ea1b630 100644
--- a/src/components/app/app.ts
+++ b/src/components/app/app.ts
@@ -55,13 +55,24 @@ export default class App extends Vue
     /**
      * This is called when the user logs in.
      *
-     * @param courses Courses Json
+     * @param token Authorization token
      */
-    public onLogin(courses: Course[])
+    public onLogin(token: string)
     {
         // Hide login bar
         this.showLogin = false;
 
+        // Save token to cookies
+        this.$cookies.set('va.token', token, '7d');
+    }
+
+    /**
+     * This is called when the user logs in.
+     *
+     * @param courses Courses Json
+     */
+    public saveCourses(courses: Course[])
+    {
         // Assign courses
         this.courses = courses;
 
diff --git a/src/components/app/app.vue b/src/components/app/app.vue
index baf4349..f04f91d 100644
--- a/src/components/app/app.vue
+++ b/src/components/app/app.vue
@@ -1,6 +1,6 @@
 <template>
     <div id="app">
-        <login v-if="showLogin" v-on:login:courses="onLogin"></login>
+        <login v-if="showLogin" v-on:login:token="onLogin"></login>
         <navigation :courses="courses" v-on:navigation:select="onNavigate"></navigation>
 
         <div id="app-content">

From cf34db2c619e28fa06b9f5a6df94fe19d193e47c Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 10:07:04 -0400
Subject: [PATCH 17/89] [+] Show splash on create

---
 src/components/app/app.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/components/app/app.ts b/src/components/app/app.ts
index ea1b630..b01f4ca 100644
--- a/src/components/app/app.ts
+++ b/src/components/app/app.ts
@@ -52,6 +52,15 @@ export default class App extends Vue
     // Are the course assignments loaded from the server.
     public assignmentsReady: boolean = false;
 
+    /**
+     * This is called when the instance is created.
+     */
+    public created()
+    {
+        // Show splash
+        console.log(Constants.SPLASH);
+    }
+
     /**
      * This is called when the user logs in.
      *

From e86d2fd4f53a4ede19103e6d7a2cb820082af6e4 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 10:08:49 -0400
Subject: [PATCH 18/89] [O] Create a better ascii art

---
 src/constants.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/constants.ts b/src/constants.ts
index b21ec85..6a32eb2 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -9,7 +9,10 @@ export default class Constants
      */
     public static API_URL: string = 'https://va.hydev.org/api';
 
-    public static SPLASH: string = '\\  /   /\\ ._  _.|  _  _ ._\n' +
-                                   ' \\/>< /--\\| |(_||\\//_(/_| \n' +
-                                   '    v0.1.1.0     /        '
+    public static SPLASH: string =
+        '.    ,        ,---.          |                        \n' +
+        '|    |.  ,    |---|,---.,---.|    ,   .,---,,---.,---.\n' +
+        ' \\  /  ><     |   ||   |,---||    |   | .-\' |---\'|    \n' +
+        '  `\'  \'  `    `   \'`   \'`---^`---\'`---|\'---\'`---\'`    \n' +
+        '      v1.1.0                      `---\'               '
 }

From 1324afe9782e26c788477d9e73c67ac162463ab4 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 10:11:08 -0400
Subject: [PATCH 19/89] [+] Create method to load data after login

---
 src/components/app/app.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/components/app/app.ts b/src/components/app/app.ts
index b01f4ca..3deccb8 100644
--- a/src/components/app/app.ts
+++ b/src/components/app/app.ts
@@ -75,6 +75,14 @@ export default class App extends Vue
         this.$cookies.set('va.token', token, '7d');
     }
 
+    /**
+     * Load data after login.
+     */
+    public loadAfterLogin()
+    {
+
+    }
+
     /**
      * This is called when the user logs in.
      *

From eaa1609b774d0590d2ba88b09c183f9090d5dceb Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 10:11:18 -0400
Subject: [PATCH 20/89] [+] Load data after login

---
 src/components/app/app.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/app/app.ts b/src/components/app/app.ts
index 3deccb8..3b3f7fe 100644
--- a/src/components/app/app.ts
+++ b/src/components/app/app.ts
@@ -73,6 +73,9 @@ export default class App extends Vue
 
         // Save token to cookies
         this.$cookies.set('va.token', token, '7d');
+
+        // Load data
+        this.loadAfterLogin();
     }
 
     /**

From 76cf8c4c53a70ecc0d121e3698ea7d5986cfaa3c Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 10:11:31 -0400
Subject: [PATCH 21/89] [+] Check cookies on initt

---
 src/components/app/app.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/components/app/app.ts b/src/components/app/app.ts
index 3b3f7fe..519d51c 100644
--- a/src/components/app/app.ts
+++ b/src/components/app/app.ts
@@ -59,6 +59,16 @@ export default class App extends Vue
     {
         // Show splash
         console.log(Constants.SPLASH);
+
+        // Check login cookies
+        if (this.$cookies.isKey('va.token'))
+        {
+            // Hide login
+            this.showLogin = false;
+
+            // Load data
+            this.loadAfterLogin();
+        }
     }
 
     /**

From bd8d7fd113fbe142e43eeaf1a92c2a028800d7f4 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 11:48:28 -0400
Subject: [PATCH 22/89] [U] Update keywords (from "token" to "data")

---
 src/components/login/login.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/login/login.ts b/src/components/login/login.ts
index 0879d78..076194f 100644
--- a/src/components/login/login.ts
+++ b/src/components/login/login.ts
@@ -38,12 +38,12 @@ export default class Login extends Vue
                 if (response.success)
                 {
                     // Call custom event with courses info
-                    this.$emit('login:token', response.token);
+                    this.$emit('login:token', response.data);
                 }
                 else
                 {
                     // Show error message
-                    this.error = response.token;
+                    this.error = response.data;
 
                     // Allow the user to retry
                     this.loading = false;

From 7af20f806bab704a3f65f8c5752bf6e217a813b3 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 12:14:57 -0400
Subject: [PATCH 23/89] [O] Move cookies detection to login class

---
 src/components/app/app.ts     | 10 ----------
 src/components/login/login.ts | 18 +++++++++++++++++-
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/components/app/app.ts b/src/components/app/app.ts
index 519d51c..3b3f7fe 100644
--- a/src/components/app/app.ts
+++ b/src/components/app/app.ts
@@ -59,16 +59,6 @@ export default class App extends Vue
     {
         // Show splash
         console.log(Constants.SPLASH);
-
-        // Check login cookies
-        if (this.$cookies.isKey('va.token'))
-        {
-            // Hide login
-            this.showLogin = false;
-
-            // Load data
-            this.loadAfterLogin();
-        }
     }
 
     /**
diff --git a/src/components/login/login.ts b/src/components/login/login.ts
index 076194f..69a7f35 100644
--- a/src/components/login/login.ts
+++ b/src/components/login/login.ts
@@ -15,6 +15,19 @@ export default class Login extends Vue
     public loading: boolean = false;
     public error: String = '';
 
+    /**
+     * This is called when the instance is created.
+     */
+    public created()
+    {
+        // Check login cookies
+        if (this.$cookies.isKey('va.token'))
+        {
+            // Already contains valid token / TODO: Validate
+            this.$emit('login:token', this.$cookies.get('va.token'));
+        }
+    }
+
     /**
      * On click, sends username and password to the server.
      */
@@ -37,7 +50,10 @@ export default class Login extends Vue
                 // Check success
                 if (response.success)
                 {
-                    // Call custom event with courses info
+                    // Save token to cookies
+                    this.$cookies.set('va.token', response.data, '7d');
+
+                    // Call custom event with token
                     this.$emit('login:token', response.data);
                 }
                 else

From 3287c14fa3f7c55ef81cd116cca115680f78fe7a Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 12:15:13 -0400
Subject: [PATCH 24/89] [+] Store token in a field

---
 src/components/app/app.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/app/app.ts b/src/components/app/app.ts
index 3b3f7fe..34c5831 100644
--- a/src/components/app/app.ts
+++ b/src/components/app/app.ts
@@ -52,6 +52,9 @@ export default class App extends Vue
     // Are the course assignments loaded from the server.
     public assignmentsReady: boolean = false;
 
+    // Token
+    public token: string = '';
+
     /**
      * This is called when the instance is created.
      */
@@ -71,8 +74,8 @@ export default class App extends Vue
         // Hide login bar
         this.showLogin = false;
 
-        // Save token to cookies
-        this.$cookies.set('va.token', token, '7d');
+        // Store token
+        this.token = token;
 
         // Load data
         this.loadAfterLogin();

From be0a657ba33a46b8853e501a79c1ef0e76c2d472 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 12:30:19 -0400
Subject: [PATCH 25/89] [+] Load courses

---
 src/components/app/app.ts | 37 ++++++++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/components/app/app.ts b/src/components/app/app.ts
index 34c5831..98e7889 100644
--- a/src/components/app/app.ts
+++ b/src/components/app/app.ts
@@ -78,23 +78,50 @@ export default class App extends Vue
         this.token = token;
 
         // Load data
-        this.loadAfterLogin();
+        this.loadCoursesAfterLogin();
     }
 
     /**
-     * Load data after login.
+     * Load courses data after login.
      */
-    public loadAfterLogin()
+    public loadCoursesAfterLogin()
     {
+        // Fetch request
+        fetch(`${Constants.API_URL}/courses`,
+            {method: 'POST', body: JSON.stringify({token: this.token})})
+        .then(res =>
+        {
+            // Get response body text
+            res.text().then(text =>
+            {
+                // Parse response
+                let response = JSON.parse(text);
 
+                // Check success
+                if (response.success)
+                {
+                    // Save courses
+                    this.courses = response.data;
+
+                    // Load assignments
+                    this.loadAssignments();
+                }
+                else
+                {
+                    // Show error message TODO: Show it properly
+                    alert(response.data);
+                }
+            })
+        })
+        .catch(alert)
     }
 
     /**
-     * This is called when the user logs in.
+     * Load the assignments of the courses
      *
      * @param courses Courses Json
      */
-    public saveCourses(courses: Course[])
+    public loadAssignments()
     {
         // Assign courses
         this.courses = courses;

From 4dc5966e51aca53c804aeb88ee16712d87b42daf Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 12:30:27 -0400
Subject: [PATCH 26/89] [+] Load assignments

---
 src/components/app/app.ts | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/components/app/app.ts b/src/components/app/app.ts
index 98e7889..5d6661a 100644
--- a/src/components/app/app.ts
+++ b/src/components/app/app.ts
@@ -123,17 +123,13 @@ export default class App extends Vue
      */
     public loadAssignments()
     {
-        // Assign courses
-        this.courses = courses;
-
-        // Debug output TODO: Remove this
-        console.log(courses);
-
         // Get assignments for all the courses
         this.courses.forEach(course =>
         {
             // Send request to get assignments
-            fetch(`${Constants.API_URL}/veracross/assignments?id=${course.assignmentsId}`).then(res =>
+            fetch(`${Constants.API_URL}/assignments`,
+                {method: 'POST', body: JSON.stringify({token: this.token, id: course.assignmentsId})})
+            .then(res =>
             {
                 // Get response body text
                 res.text().then(text =>

From 7b0f11a1f488c1a8fd61507332a481ad90ec736c Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 13:01:05 -0400
Subject: [PATCH 27/89] [F] Fix assignments null

---
 src/components/app/app.ts | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/components/app/app.ts b/src/components/app/app.ts
index 5d6661a..5449641 100644
--- a/src/components/app/app.ts
+++ b/src/components/app/app.ts
@@ -134,8 +134,21 @@ export default class App extends Vue
                 // Get response body text
                 res.text().then(text =>
                 {
-                    // Parse json and filter it
-                    course.assignments = JsonUtils.filterAssignments(JSON.parse(text));
+                    // Parse response
+                    let response = JSON.parse(text);
+
+                    // Check success
+                    if (response.success)
+                    {
+                        // Load assignments
+                        // Parse json and filter it
+                        course.assignments = JsonUtils.filterAssignments(response.data);
+                    }
+                    else
+                    {
+                        // Show error message TODO: Show it properly
+                        alert(response.data);
+                    }
                 })
             })
             .catch(err =>

From 53a0884d0bb808d5a78a907e554e5fd274149bd1 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 13:56:43 -0400
Subject: [PATCH 28/89] [+] Create http-utils class

---
 src/utils/http-utils.ts | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 src/utils/http-utils.ts

diff --git a/src/utils/http-utils.ts b/src/utils/http-utils.ts
new file mode 100644
index 0000000..7495f67
--- /dev/null
+++ b/src/utils/http-utils.ts
@@ -0,0 +1,35 @@
+import Constants from '@/constants';
+
+export class HttpUtils
+{
+    private token: string = '';
+
+    public HttpUtils(token: string)
+    {
+        this.token = token;
+    }
+
+    public post(node: string, body: any): Promise<any>
+    {
+        // Add token
+        if (this.token != '') body['token'] = this.token;
+
+        // Create promise
+        return new Promise<any>((resolve, reject) =>
+        {
+            // Fetch request
+            fetch(`${Constants.API_URL}${node}`, {method: 'POST', body: body}).then(res =>
+            {
+                // Get response body text
+                res.text().then(text =>
+                {
+                    // Parse response
+                    let response = JSON.parse(text);
+                    resolve(response);
+                })
+                .catch(reject)
+            })
+            .catch(reject)
+        });
+    }
+}

From 06c265159b125fd94f0fe5d9a89cec3ef584c45d Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 13:59:05 -0400
Subject: [PATCH 29/89] [F] Fix constructor

---
 src/utils/http-utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/http-utils.ts b/src/utils/http-utils.ts
index 7495f67..6e03f25 100644
--- a/src/utils/http-utils.ts
+++ b/src/utils/http-utils.ts
@@ -4,7 +4,7 @@ export class HttpUtils
 {
     private token: string = '';
 
-    public HttpUtils(token: string)
+    constructor (token: string)
     {
         this.token = token;
     }

From 393fc1cc71e3c5087e8ae7c50f2f9ec76d1aac3d Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 14:04:23 -0400
Subject: [PATCH 30/89] [+] Create http field in App.ts

---
 src/components/app/app.ts | 7 +++++++
 src/utils/http-utils.ts   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/app/app.ts b/src/components/app/app.ts
index 5449641..befe5f3 100644
--- a/src/components/app/app.ts
+++ b/src/components/app/app.ts
@@ -5,6 +5,7 @@ import Overall from '@/pages/overall/overall';
 import Constants from '@/constants';
 import JsonUtils from '@/utils/json-utils';
 import pWaitFor from 'p-wait-for';
+import {HttpUtils} from '@/utils/http-utils';
 
 /**
  * Objects of this interface represent assignment grades.
@@ -55,6 +56,9 @@ export default class App extends Vue
     // Token
     public token: string = '';
 
+    // Http Client
+    public http: HttpUtils = new HttpUtils('');
+
     /**
      * This is called when the instance is created.
      */
@@ -77,6 +81,9 @@ export default class App extends Vue
         // Store token
         this.token = token;
 
+        // Assign token to http client
+        this.http.token = token;
+
         // Load data
         this.loadCoursesAfterLogin();
     }
diff --git a/src/utils/http-utils.ts b/src/utils/http-utils.ts
index 6e03f25..ac00b72 100644
--- a/src/utils/http-utils.ts
+++ b/src/utils/http-utils.ts
@@ -2,7 +2,7 @@ import Constants from '@/constants';
 
 export class HttpUtils
 {
-    private token: string = '';
+    public token: string = '';
 
     constructor (token: string)
     {

From a7384753c80e439186abef6ba4f1a98e8e5b8077 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 14:04:38 -0400
Subject: [PATCH 31/89] [O] Optimize loadCourses request

---
 src/components/app/app.ts | 39 ++++++++++++++-------------------------
 1 file changed, 14 insertions(+), 25 deletions(-)

diff --git a/src/components/app/app.ts b/src/components/app/app.ts
index befe5f3..aee637f 100644
--- a/src/components/app/app.ts
+++ b/src/components/app/app.ts
@@ -93,34 +93,23 @@ export default class App extends Vue
      */
     public loadCoursesAfterLogin()
     {
-        // Fetch request
-        fetch(`${Constants.API_URL}/courses`,
-            {method: 'POST', body: JSON.stringify({token: this.token})})
-        .then(res =>
+        this.http.post('/courses', {}).then(response =>
         {
-            // Get response body text
-            res.text().then(text =>
+            // Check success
+            if (response.success)
             {
-                // Parse response
-                let response = JSON.parse(text);
+                // Save courses
+                this.courses = response.data;
 
-                // Check success
-                if (response.success)
-                {
-                    // Save courses
-                    this.courses = response.data;
-
-                    // Load assignments
-                    this.loadAssignments();
-                }
-                else
-                {
-                    // Show error message TODO: Show it properly
-                    alert(response.data);
-                }
-            })
-        })
-        .catch(alert)
+                // Load assignments
+                this.loadAssignments();
+            }
+            else
+            {
+                // Show error message TODO: Show it properly
+                alert(response.data);
+            }
+        });
     }
 
     /**

From 5ac3183ec1ff3a262da7b9d78f06d1f2912f1b44 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 14:04:59 -0400
Subject: [PATCH 32/89] [F] Fix body isn't in json format problem

---
 src/utils/http-utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/http-utils.ts b/src/utils/http-utils.ts
index ac00b72..c4bc537 100644
--- a/src/utils/http-utils.ts
+++ b/src/utils/http-utils.ts
@@ -18,7 +18,7 @@ export class HttpUtils
         return new Promise<any>((resolve, reject) =>
         {
             // Fetch request
-            fetch(`${Constants.API_URL}${node}`, {method: 'POST', body: body}).then(res =>
+            fetch(`${Constants.API_URL}${node}`, {method: 'POST', body: JSON.stringify(body)}).then(res =>
             {
                 // Get response body text
                 res.text().then(text =>

From 1ca32b5ebdc8692c651a4262eadfb9d141e12f26 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 14:07:49 -0400
Subject: [PATCH 33/89] [O] Optimize loadAssignments()

---
 src/components/app/app.ts | 41 ++++++++++++++-------------------------
 1 file changed, 15 insertions(+), 26 deletions(-)

diff --git a/src/components/app/app.ts b/src/components/app/app.ts
index aee637f..21044a1 100644
--- a/src/components/app/app.ts
+++ b/src/components/app/app.ts
@@ -109,7 +109,8 @@ export default class App extends Vue
                 // Show error message TODO: Show it properly
                 alert(response.data);
             }
-        });
+        })
+        .catch(alert);
     }
 
     /**
@@ -123,34 +124,22 @@ export default class App extends Vue
         this.courses.forEach(course =>
         {
             // Send request to get assignments
-            fetch(`${Constants.API_URL}/assignments`,
-                {method: 'POST', body: JSON.stringify({token: this.token, id: course.assignmentsId})})
-            .then(res =>
+            this.http.post('/assignments', {id: course.assignmentsId}).then(response =>
             {
-                // Get response body text
-                res.text().then(text =>
+                // Check success
+                if (response.success)
                 {
-                    // Parse response
-                    let response = JSON.parse(text);
-
-                    // Check success
-                    if (response.success)
-                    {
-                        // Load assignments
-                        // Parse json and filter it
-                        course.assignments = JsonUtils.filterAssignments(response.data);
-                    }
-                    else
-                    {
-                        // Show error message TODO: Show it properly
-                        alert(response.data);
-                    }
-                })
+                    // Load assignments
+                    // Parse json and filter it
+                    course.assignments = JsonUtils.filterAssignments(response.data);
+                }
+                else
+                {
+                    // Show error message TODO: Show it properly
+                    alert(response.data);
+                }
             })
-            .catch(err =>
-            {
-                alert(err);
-            });
+            .catch(alert);
         });
 
         // Wait for assignments to be ready.

From 448e699cd3c56b49dce54f48a5e901de5f549cca Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 14:42:22 -0400
Subject: [PATCH 34/89] [O] Optimize login http fetch

---
 src/components/app/app.vue    |  2 +-
 src/components/login/login.ts | 48 ++++++++++++++++-------------------
 2 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/src/components/app/app.vue b/src/components/app/app.vue
index f04f91d..17879e9 100644
--- a/src/components/app/app.vue
+++ b/src/components/app/app.vue
@@ -1,6 +1,6 @@
 <template>
     <div id="app">
-        <login v-if="showLogin" v-on:login:token="onLogin"></login>
+        <login v-if="showLogin" v-on:login:token="onLogin" :http="http"></login>
         <navigation :courses="courses" v-on:navigation:select="onNavigate"></navigation>
 
         <div id="app-content">
diff --git a/src/components/login/login.ts b/src/components/login/login.ts
index 69a7f35..dcab806 100644
--- a/src/components/login/login.ts
+++ b/src/components/login/login.ts
@@ -1,5 +1,6 @@
-import {Component, Vue} from 'vue-property-decorator';
+import {Component, Prop, Vue} from 'vue-property-decorator';
 import Constants from '@/constants';
+import {HttpUtils} from '@/utils/http-utils';
 
 /**
  * This component handles user login, and obtains data from the server.
@@ -15,6 +16,9 @@ export default class Login extends Vue
     public loading: boolean = false;
     public error: String = '';
 
+    @Prop()
+    public http?: HttpUtils;
+
     /**
      * This is called when the instance is created.
      */
@@ -36,35 +40,27 @@ export default class Login extends Vue
         // Make login button loading
         this.loading = true;
 
-        // Fetch request TODO: Add username and password when the https server is ready.
-        fetch(`${Constants.API_URL}/login`,
-            {method: 'POST', body: JSON.stringify({username: this.username, password: this.password})})
-        .then(res =>
+        // Fetch request
+        (<HttpUtils> this.http).post('/login', {username: this.username, password: this.password})
+        .then(response =>
         {
-            // Get response body text
-            res.text().then(text =>
+            // Check success
+            if (response.success)
             {
-                // Parse response
-                let response = JSON.parse(text);
+                // Save token to cookies
+                this.$cookies.set('va.token', response.data, '7d');
 
-                // Check success
-                if (response.success)
-                {
-                    // Save token to cookies
-                    this.$cookies.set('va.token', response.data, '7d');
+                // Call custom event with token
+                this.$emit('login:token', response.data);
+            }
+            else
+            {
+                // Show error message
+                this.error = response.data;
 
-                    // Call custom event with token
-                    this.$emit('login:token', response.data);
-                }
-                else
-                {
-                    // Show error message
-                    this.error = response.data;
-
-                    // Allow the user to retry
-                    this.loading = false;
-                }
-            })
+                // Allow the user to retry
+                this.loading = false;
+            }
         })
         .catch(err =>
         {

From 13e307f8d206b125748371765b4c0068aaa10b33 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 14:52:54 -0400
Subject: [PATCH 35/89] [+] Create GPA scale

---
 src/utils/gpa-utils.ts | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 src/utils/gpa-utils.ts

diff --git a/src/utils/gpa-utils.ts b/src/utils/gpa-utils.ts
new file mode 100644
index 0000000..d63b73b
--- /dev/null
+++ b/src/utils/gpa-utils.ts
@@ -0,0 +1,21 @@
+/**
+ * This is an utility class to calculate GPA.
+ */
+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]
+    ];
+}

From 7bad961f70f9109618c56e2016197b817d49ab90 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 14:57:37 -0400
Subject: [PATCH 36/89] [+] Add field `level` and `scaleUp`

---
 src/components/app/app.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/app/app.ts b/src/components/app/app.ts
index 21044a1..dd1486e 100644
--- a/src/components/app/app.ts
+++ b/src/components/app/app.ts
@@ -33,6 +33,9 @@ export interface Course
     name: string,
     teacherName: string,
 
+    level: string,
+    scaleUp: number,
+
     assignments: Grade[]
 }
 

From d566b53c22cb9f735c60660d68d2d28e32f4f2ca Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 15:49:11 -0400
Subject: [PATCH 37/89] [+] Create letterGrade and numericGrade fields

---
 src/components/app/app.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/app/app.ts b/src/components/app/app.ts
index dd1486e..7c1b74c 100644
--- a/src/components/app/app.ts
+++ b/src/components/app/app.ts
@@ -33,6 +33,9 @@ export interface Course
     name: string,
     teacherName: string,
 
+    letterGrade?: string,
+    numericGrade?: number,
+
     level: string,
     scaleUp: number,
 

From d3072ccaf62733bd1c6a4bde3fcb7fef2997be3d Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 16:03:34 -0400
Subject: [PATCH 38/89] [+] Create keyword constants in GPAUtils

---
 src/utils/gpa-utils.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/utils/gpa-utils.ts b/src/utils/gpa-utils.ts
index d63b73b..44ecb9c 100644
--- a/src/utils/gpa-utils.ts
+++ b/src/utils/gpa-utils.ts
@@ -18,4 +18,9 @@ export class GPAUtils
         [69.5, 'D' , 1.00],
         [0   , 'F' , 0.00]
     ];
+
+    // Keywords
+    public static MIN = 0;
+    public static LETTER = 1;
+    public static GPA = 2;
 }

From 3cb74083a74a8b0dfde2261776c614302029c3cc Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 16:03:57 -0400
Subject: [PATCH 39/89] [+] Create method to calculate GPA

---
 src/utils/gpa-utils.ts | 47 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/src/utils/gpa-utils.ts b/src/utils/gpa-utils.ts
index 44ecb9c..db95f36 100644
--- a/src/utils/gpa-utils.ts
+++ b/src/utils/gpa-utils.ts
@@ -1,6 +1,8 @@
 /**
  * This is an utility class to calculate GPA.
  */
+import {Course} from '@/components/app/app';
+
 export class GPAUtils
 {
     // [[Min score, Letter grade, Base GPA], ...]
@@ -23,4 +25,49 @@ export class GPAUtils
     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 gpa(coursesOriginal: Course[]): number
+    {
+        // Clone array
+        let courses: Course[] = [];
+
+        // Remove all courses that does not have a grade
+        coursesOriginal.forEach(course =>
+        {
+            if (course.numericGrade != null)
+            {
+                courses.push(course);
+            }
+        });
+
+        // If no course have grade, return -1
+        if (courses.length == 0)
+        {
+            return -1;
+        }
+
+        // Count total GPA
+        let totalGPA = 0;
+        courses.forEach(course =>
+        {
+            // Find the GPA for this course. TODO: Remove course that does not have level
+            this.SCALE.forEach(scale =>
+            {
+                // Letter grades are the same
+                if (scale[this.LETTER] == course.letterGrade)
+                {
+                    totalGPA += <number> scale[this.GPA] + course.scaleUp;
+                    return;
+                }
+            })
+        });
+
+        // Get average GPA
+        return totalGPA / courses.length;
+    }
 }

From b2db05d5e29324deded960baf3cbb6e41eb85ee9 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 16:04:50 -0400
Subject: [PATCH 40/89] [O] Remove course that does not have level

---
 src/utils/gpa-utils.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils/gpa-utils.ts b/src/utils/gpa-utils.ts
index db95f36..27e2616 100644
--- a/src/utils/gpa-utils.ts
+++ b/src/utils/gpa-utils.ts
@@ -39,7 +39,7 @@ export class GPAUtils
         // Remove all courses that does not have a grade
         coursesOriginal.forEach(course =>
         {
-            if (course.numericGrade != null)
+            if (course.numericGrade != null && course.level != 'none')
             {
                 courses.push(course);
             }
@@ -55,7 +55,7 @@ export class GPAUtils
         let totalGPA = 0;
         courses.forEach(course =>
         {
-            // Find the GPA for this course. TODO: Remove course that does not have level
+            // Find the GPA for this course.
             this.SCALE.forEach(scale =>
             {
                 // Letter grades are the same

From 5da0e89e08aa5bf5177d3ae4c125699cf9215c62 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 16:12:32 -0400
Subject: [PATCH 41/89] [+] Return boolean indicating accurate or not when
 calculating gpa

---
 src/utils/gpa-utils.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/utils/gpa-utils.ts b/src/utils/gpa-utils.ts
index 27e2616..eddc8d9 100644
--- a/src/utils/gpa-utils.ts
+++ b/src/utils/gpa-utils.ts
@@ -31,7 +31,7 @@ export class GPAUtils
      *
      * @param coursesOriginal List of courses
      */
-    public static gpa(coursesOriginal: Course[]): number
+    public static gpa(coursesOriginal: Course[]): {gpa: number, accurate: boolean}
     {
         // Clone array
         let courses: Course[] = [];
@@ -48,7 +48,7 @@ export class GPAUtils
         // If no course have grade, return -1
         if (courses.length == 0)
         {
-            return -1;
+            return {gpa: -1, accurate: false};
         }
 
         // Count total GPA
@@ -68,6 +68,6 @@ export class GPAUtils
         });
 
         // Get average GPA
-        return totalGPA / courses.length;
+        return {gpa: totalGPA / courses.length, accurate: courses.length == coursesOriginal.length};
     }
 }

From 68afbb8c76cdaf8dd3b6492ca4abe8815762d3c2 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 16:14:42 -0400
Subject: [PATCH 42/89] [O] Optimize accuracy detection

---
 src/utils/gpa-utils.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/utils/gpa-utils.ts b/src/utils/gpa-utils.ts
index eddc8d9..8b712fd 100644
--- a/src/utils/gpa-utils.ts
+++ b/src/utils/gpa-utils.ts
@@ -36,10 +36,17 @@ export class GPAUtils
         // 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.numericGrade != null && course.level != 'none')
+            if (course.numericGrade == null)
+            {
+                accurate = false;
+            }
+            else if (course.level != 'none')
             {
                 courses.push(course);
             }
@@ -68,6 +75,6 @@ export class GPAUtils
         });
 
         // Get average GPA
-        return {gpa: totalGPA / courses.length, accurate: courses.length == coursesOriginal.length};
+        return {gpa: totalGPA / courses.length, accurate: accurate};
     }
 }

From 4c822fd207bc472e676b3b87798f8d34197e11c7 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 16:32:05 -0400
Subject: [PATCH 43/89] [+] Add borders to navigation

---
 src/components/navigation/navigation.scss | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/components/navigation/navigation.scss b/src/components/navigation/navigation.scss
index ca538fb..6b6cea7 100644
--- a/src/components/navigation/navigation.scss
+++ b/src/components/navigation/navigation.scss
@@ -3,3 +3,14 @@
     display: inline-block !important;
     float: none !important;
 }
+
+// Borders
+#navigation
+{
+    box-shadow: 0 0 3px #00000082;
+
+    ul
+    {
+        border-bottom-width: 0;
+    }
+}

From 67cf33b48c90ec71ac6ce2ebbe50c7cde94201a7 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 16:44:34 -0400
Subject: [PATCH 44/89] [F] Remove scaleUp if score is 0

---
 src/utils/gpa-utils.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/utils/gpa-utils.ts b/src/utils/gpa-utils.ts
index 8b712fd..ed5bd77 100644
--- a/src/utils/gpa-utils.ts
+++ b/src/utils/gpa-utils.ts
@@ -68,7 +68,14 @@ export class GPAUtils
                 // Letter grades are the same
                 if (scale[this.LETTER] == course.letterGrade)
                 {
-                    totalGPA += <number> scale[this.GPA] + course.scaleUp;
+                    // Get grade and add it
+                    let grade = <number> scale[this.GPA];
+                    totalGPA += grade;
+
+                    // Add scaleUp if not failed.
+                    if (grade != 0) totalGPA += course.scaleUp;
+
+                    // That's it
                     return;
                 }
             })

From 6e7041edcd10a8dd4cad58a3765ef9f9cb4db3d4 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 16:46:46 -0400
Subject: [PATCH 45/89] [+] Create method to calculate GP for a course

---
 src/utils/gpa-utils.ts | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/utils/gpa-utils.ts b/src/utils/gpa-utils.ts
index ed5bd77..0ebeb3c 100644
--- a/src/utils/gpa-utils.ts
+++ b/src/utils/gpa-utils.ts
@@ -31,7 +31,7 @@ export class GPAUtils
      *
      * @param coursesOriginal List of courses
      */
-    public static gpa(coursesOriginal: Course[]): {gpa: number, accurate: boolean}
+    public static getGPA(coursesOriginal: Course[]): {gpa: number, accurate: boolean}
     {
         // Clone array
         let courses: Course[] = [];
@@ -84,4 +84,29 @@ export class GPAUtils
         // Get average GPA
         return {gpa: totalGPA / courses.length, accurate: accurate};
     }
+
+    /**
+     * Calculate GPA for a course
+     *
+     * @param course Course
+     */
+    public static getGP(course: Course)
+    {
+        // Find the GPA for this course.
+        return this.SCALE.forEach(scale =>
+        {
+            // Letter grades are the same
+            if (scale[this.LETTER] == course.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;
+            }
+        })
+    }
 }

From 517235982b52e4fc78f135d50a304e7f6d986ca3 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 16:48:46 -0400
Subject: [PATCH 46/89] [F] Fix return type void

---
 src/utils/gpa-utils.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/utils/gpa-utils.ts b/src/utils/gpa-utils.ts
index 0ebeb3c..4f58431 100644
--- a/src/utils/gpa-utils.ts
+++ b/src/utils/gpa-utils.ts
@@ -90,10 +90,10 @@ export class GPAUtils
      *
      * @param course Course
      */
-    public static getGP(course: Course)
+    public static getGP(course: Course): number
     {
         // Find the GPA for this course.
-        return this.SCALE.forEach(scale =>
+        for (let scale of this.SCALE)
         {
             // Letter grades are the same
             if (scale[this.LETTER] == course.letterGrade)
@@ -107,6 +107,8 @@ export class GPAUtils
                 // That's it
                 return grade;
             }
-        })
+        }
+
+        return -1;
     }
 }

From 042e72abb62d6d4fd17f2529cc7537cf74014488 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 16:48:57 -0400
Subject: [PATCH 47/89] [O] Reduce redundant code

---
 src/utils/gpa-utils.ts | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/utils/gpa-utils.ts b/src/utils/gpa-utils.ts
index 4f58431..1d16fce 100644
--- a/src/utils/gpa-utils.ts
+++ b/src/utils/gpa-utils.ts
@@ -62,23 +62,7 @@ export class GPAUtils
         let totalGPA = 0;
         courses.forEach(course =>
         {
-            // Find the GPA for this course.
-            this.SCALE.forEach(scale =>
-            {
-                // Letter grades are the same
-                if (scale[this.LETTER] == course.letterGrade)
-                {
-                    // Get grade and add it
-                    let grade = <number> scale[this.GPA];
-                    totalGPA += grade;
-
-                    // Add scaleUp if not failed.
-                    if (grade != 0) totalGPA += course.scaleUp;
-
-                    // That's it
-                    return;
-                }
-            })
+            totalGPA += this.getGP(course);
         });
 
         // Get average GPA

From 0e618ceb1332a2a5065de2b5b97e6c1594a66046 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 7 Sep 2019 17:04:04 -0400
Subject: [PATCH 48/89] [+] Create cards in overall

---
 src/pages/overall/overall.vue | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/pages/overall/overall.vue b/src/pages/overall/overall.vue
index e84e0de..9223a2c 100644
--- a/src/pages/overall/overall.vue
+++ b/src/pages/overall/overall.vue
@@ -1,7 +1,25 @@
 <template>
     <div id="overall">
-        <p>这是 Overall</p>
-        <graph-overall :chart="convertCharts"></graph-overall>
+        <el-row>
+            <el-col :span="4">
+                <el-card :body-style="{ padding: '0px' }">
+                    <div style="padding: 14px;">
+                        <span>GPA: 4.56</span>
+                        <div class="bottom clearfix">
+                            <time class="time">{{ new Date().toDateString() }}</time>
+                            <el-button type="text" class="button">操作按钮</el-button>
+                        </div>
+                    </div>
+                </el-card>
+            </el-col>
+            <el-col :span="20">
+                <el-card :body-style="{ padding: '0px' }">
+                    <p>Your average score graph all time:</p>
+                    <graph-overall :chart="convertCharts"></graph-overall>
+                </el-card>
+            </el-col>
+        </el-row>
+        <div class=""></div>
     </div>
 </template>
 

From 4095041925f1b6ed0600219ea850d609f0b28086 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Mon, 16 Sep 2019 22:23:52 -0400
Subject: [PATCH 49/89] [+] Add status field in course model

---
 src/components/app/app.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/app/app.ts b/src/components/app/app.ts
index 7c1b74c..cebb43c 100644
--- a/src/components/app/app.ts
+++ b/src/components/app/app.ts
@@ -32,6 +32,7 @@ export interface Course
     id: number,
     name: string,
     teacherName: string,
+    status: string,
 
     letterGrade?: string,
     numericGrade?: number,

From 0ebce968b91ef5dc0d898c49d242a9710282590e Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Mon, 16 Sep 2019 22:24:06 -0400
Subject: [PATCH 50/89] [T] Test GPA calculations

---
 src/components/app/app.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/app/app.ts b/src/components/app/app.ts
index cebb43c..1881d6d 100644
--- a/src/components/app/app.ts
+++ b/src/components/app/app.ts
@@ -6,6 +6,7 @@ import Constants from '@/constants';
 import JsonUtils from '@/utils/json-utils';
 import pWaitFor from 'p-wait-for';
 import {HttpUtils} from '@/utils/http-utils';
+import {GPAUtils} from '@/utils/gpa-utils';
 
 /**
  * Objects of this interface represent assignment grades.
@@ -108,6 +109,9 @@ export default class App extends Vue
                 // Save courses
                 this.courses = response.data;
 
+                // TODO: Delete this
+                console.log(GPAUtils.getGPA(this.courses));
+
                 // Load assignments
                 this.loadAssignments();
             }

From cbec0add3be4b028232eae1f0d587b08e6df882d Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Mon, 16 Sep 2019 22:24:10 -0400
Subject: [PATCH 51/89] Revert "[T] Test GPA calculations"

This reverts commit 0ebce968b91ef5dc0d898c49d242a9710282590e.
---
 src/components/app/app.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/components/app/app.ts b/src/components/app/app.ts
index 1881d6d..cebb43c 100644
--- a/src/components/app/app.ts
+++ b/src/components/app/app.ts
@@ -6,7 +6,6 @@ import Constants from '@/constants';
 import JsonUtils from '@/utils/json-utils';
 import pWaitFor from 'p-wait-for';
 import {HttpUtils} from '@/utils/http-utils';
-import {GPAUtils} from '@/utils/gpa-utils';
 
 /**
  * Objects of this interface represent assignment grades.
@@ -109,9 +108,6 @@ export default class App extends Vue
                 // Save courses
                 this.courses = response.data;
 
-                // TODO: Delete this
-                console.log(GPAUtils.getGPA(this.courses));
-
                 // Load assignments
                 this.loadAssignments();
             }

From 2beca45e38927b9bd49aa31797de92892f4d221c Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Mon, 16 Sep 2019 22:24:47 -0400
Subject: [PATCH 52/89] [+] Encapsulate method to get GPA string

---
 src/pages/overall/overall.ts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/pages/overall/overall.ts b/src/pages/overall/overall.ts
index e1c9c14..f355423 100644
--- a/src/pages/overall/overall.ts
+++ b/src/pages/overall/overall.ts
@@ -1,6 +1,7 @@
 import {Component, Prop, Vue} from 'vue-property-decorator';
 import GraphOverall from '@/pages/overall/graph-overall/graph-overall';
 import {Course} from '@/components/app/app';
+import {GPAUtils} from '@/utils/gpa-utils';
 
 @Component({
     components: {GraphOverall}
@@ -95,4 +96,18 @@ export default class Overall extends Vue
             rows: rows
         }
     }
+
+    public getGPA()
+    {
+        let gpa = GPAUtils.getGPA(this.courses);
+        let result = '' + gpa.gpa;
+
+        // Not accurate
+        if (!gpa.accurate)
+        {
+            result = `(${result})`;
+        }
+
+        return result;
+    }
 }

From bb4b34722fd1a380c6b5f1bebcc1f6032afc00bd Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Mon, 16 Sep 2019 22:24:56 -0400
Subject: [PATCH 53/89] [+] Display GPA string

---
 src/pages/overall/overall.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/overall/overall.vue b/src/pages/overall/overall.vue
index 9223a2c..79a49eb 100644
--- a/src/pages/overall/overall.vue
+++ b/src/pages/overall/overall.vue
@@ -4,7 +4,7 @@
             <el-col :span="4">
                 <el-card :body-style="{ padding: '0px' }">
                     <div style="padding: 14px;">
-                        <span>GPA: 4.56</span>
+                        <span>GPA: {{getGPA()}}</span>
                         <div class="bottom clearfix">
                             <time class="time">{{ new Date().toDateString() }}</time>
                             <el-button type="text" class="button">操作按钮</el-button>

From c885137ed7102acbfef0a471c211c50f12b97534 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Mon, 16 Sep 2019 22:47:13 -0400
Subject: [PATCH 54/89] [O] Fix floating point precision errors

---
 src/utils/gpa-utils.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/utils/gpa-utils.ts b/src/utils/gpa-utils.ts
index 1d16fce..ae8b48b 100644
--- a/src/utils/gpa-utils.ts
+++ b/src/utils/gpa-utils.ts
@@ -65,8 +65,11 @@ export class GPAUtils
             totalGPA += this.getGP(course);
         });
 
-        // Get average GPA
-        return {gpa: totalGPA / courses.length, accurate: accurate};
+        // Get average GPA, round to two decimal places
+        let gpa = Math.round(totalGPA / courses.length * 100) / 100;
+
+        // Return results
+        return {gpa: gpa, accurate: accurate};
     }
 
     /**

From 820c3c11481ec1bb00fd53896b7b0c228f29b62f Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Wed, 18 Sep 2019 08:27:27 -0400
Subject: [PATCH 55/89] [O] Optimize layout

---
 src/pages/overall/overall.vue | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/pages/overall/overall.vue b/src/pages/overall/overall.vue
index 79a49eb..cedbaa7 100644
--- a/src/pages/overall/overall.vue
+++ b/src/pages/overall/overall.vue
@@ -2,18 +2,21 @@
     <div id="overall">
         <el-row>
             <el-col :span="4">
-                <el-card :body-style="{ padding: '0px' }">
+                <el-card style="margin-left: 20px">
                     <div style="padding: 14px;">
-                        <span>GPA: {{getGPA()}}</span>
-                        <div class="bottom clearfix">
+                        <span class="span-gpa-header">GPA:</span>
+                        <br>
+                        <span class="span-gpa">{{getGPA()}}</span>
+                        <div class="bottom clearfix gpa-time">
                             <time class="time">{{ new Date().toDateString() }}</time>
-                            <el-button type="text" class="button">操作按钮</el-button>
+                            <br>
+                            <el-button type="text" class="button">Button</el-button>
                         </div>
                     </div>
                 </el-card>
             </el-col>
             <el-col :span="20">
-                <el-card :body-style="{ padding: '0px' }">
+                <el-card style="margin-right: 20px">
                     <p>Your average score graph all time:</p>
                     <graph-overall :chart="convertCharts"></graph-overall>
                 </el-card>

From 9c2c1c3195d9410e01102e1f28bb0a22efb8160f Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Wed, 18 Sep 2019 08:27:59 -0400
Subject: [PATCH 56/89] [O] Optimize card margins

---
 src/pages/overall/overall.scss | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/pages/overall/overall.scss b/src/pages/overall/overall.scss
index e69de29..790e52b 100644
--- a/src/pages/overall/overall.scss
+++ b/src/pages/overall/overall.scss
@@ -0,0 +1,8 @@
+
+// Add some margins
+.el-card
+{
+    margin: 10px;
+    height: 494px;
+    padding: 0;
+}

From c31dbf0e506782b149969b6b776a11fcde88f687 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Wed, 18 Sep 2019 21:50:05 -0400
Subject: [PATCH 57/89] [O] Make GPA header font smaller

---
 src/pages/overall/overall.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pages/overall/overall.scss b/src/pages/overall/overall.scss
index 790e52b..6606a18 100644
--- a/src/pages/overall/overall.scss
+++ b/src/pages/overall/overall.scss
@@ -6,3 +6,8 @@
     height: 494px;
     padding: 0;
 }
+
+.span-gpa-header
+{
+    font-size: 14px;
+}

From 17ef8f4380bcf8dad2bf13b0ed46ed3ed0c45242 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Wed, 18 Sep 2019 21:50:19 -0400
Subject: [PATCH 58/89] [O] Vertically center

---
 src/pages/overall/overall.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pages/overall/overall.scss b/src/pages/overall/overall.scss
index 6606a18..29e610b 100644
--- a/src/pages/overall/overall.scss
+++ b/src/pages/overall/overall.scss
@@ -5,6 +5,11 @@
     margin: 10px;
     height: 494px;
     padding: 0;
+
+    // Vertical center
+    display: flex;
+    justify-content: center;
+    flex-direction: column;
 }
 
 .span-gpa-header

From 9157232d45bbaba0b9cb8bf1f82417582148a2f6 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Wed, 18 Sep 2019 21:50:32 -0400
Subject: [PATCH 59/89] [O] Make GPA font size larger

---
 src/pages/overall/overall.scss | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/pages/overall/overall.scss b/src/pages/overall/overall.scss
index 29e610b..11bee38 100644
--- a/src/pages/overall/overall.scss
+++ b/src/pages/overall/overall.scss
@@ -16,3 +16,9 @@
 {
     font-size: 14px;
 }
+
+.span-gpa
+{
+    font-size: 35px;
+    font-family: 'Avenir', Helvetica, Arial, sans-serif;
+}

From e51dbd2c5b60e17d78745ad1649183678314fb1a Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Wed, 18 Sep 2019 21:50:44 -0400
Subject: [PATCH 60/89] [O] Make GPA time font size smaller

---
 src/pages/overall/overall.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pages/overall/overall.scss b/src/pages/overall/overall.scss
index 11bee38..05df0af 100644
--- a/src/pages/overall/overall.scss
+++ b/src/pages/overall/overall.scss
@@ -22,3 +22,8 @@
     font-size: 35px;
     font-family: 'Avenir', Helvetica, Arial, sans-serif;
 }
+
+.gpa-time
+{
+    font-size: 14px;
+}

From e7c513695d120ecab1977d25db1ef360363e97f2 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Wed, 18 Sep 2019 21:51:27 -0400
Subject: [PATCH 61/89] [O] Disable host check

---
 vue.config.js | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 vue.config.js

diff --git a/vue.config.js b/vue.config.js
new file mode 100644
index 0000000..3b2a20f
--- /dev/null
+++ b/vue.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+    devServer: {
+        disableHostCheck: true,
+    }
+}

From 002aa8444476c354d5e936385f48ba34bab6cb89 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Wed, 18 Sep 2019 21:52:10 -0400
Subject: [PATCH 62/89] [O] Ignore non-active scores

---
 src/pages/overall/overall.ts | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/pages/overall/overall.ts b/src/pages/overall/overall.ts
index f355423..2f5dc47 100644
--- a/src/pages/overall/overall.ts
+++ b/src/pages/overall/overall.ts
@@ -19,6 +19,9 @@ export default class Overall extends Vue
         let columns = ['date'];
         this.courses.forEach((course: Course) =>
         {
+            // Ignore non-important courses
+            if (course.status != 'active') return;
+
             columns.push(course.name);
         });
 
@@ -26,6 +29,9 @@ export default class Overall extends Vue
         let minDate: Date = new Date();
         this.courses.forEach((course: Course) =>
         {
+            // Ignore non-important courses
+            if (course.status != 'active') return;
+
             let date = new Date(course.assignments[course.assignments.length - 1].date);
             if (date < minDate) minDate = date;
         });
@@ -44,6 +50,9 @@ export default class Overall extends Vue
         let courseIndexes: {[index: string]: any} = {};
         this.courses.forEach((course: Course) =>
         {
+            // Ignore non-important courses
+            if (course.status != 'active') return;
+
             courseScores[course.name] = 0;
             courseMaxScores[course.name] = 0;
             courseIndexes[course.name] = course.assignments.length - 1;
@@ -59,6 +68,9 @@ export default class Overall extends Vue
             // Loop through courses
             this.courses.forEach((course: Course) =>
             {
+                // Ignore non-important courses
+                if (course.status != 'active') return;
+
                 // Reversed loop through the assignments
                 for (let r = courseIndexes[course.name]; r >= 0; r--)
                 {
@@ -102,11 +114,11 @@ export default class Overall extends Vue
         let gpa = GPAUtils.getGPA(this.courses);
         let result = '' + gpa.gpa;
 
-        // Not accurate
+        /* Not accurate
         if (!gpa.accurate)
         {
             result = `(${result})`;
-        }
+        }*/
 
         return result;
     }

From b8dfb8f732821f479428a2058401ba660fd89c60 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Wed, 18 Sep 2019 23:07:43 -0400
Subject: [PATCH 63/89] [F] Fix negative index problem

---
 src/pages/overall/overall.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/overall/overall.ts b/src/pages/overall/overall.ts
index 2f5dc47..877125d 100644
--- a/src/pages/overall/overall.ts
+++ b/src/pages/overall/overall.ts
@@ -32,6 +32,7 @@ export default class Overall extends Vue
             // Ignore non-important courses
             if (course.status != 'active') return;
 
+            if (course.assignments.length == 0) return;
             let date = new Date(course.assignments[course.assignments.length - 1].date);
             if (date < minDate) minDate = date;
         });

From b95220ba1ae1f95f02e9fead9923471bae259ff9 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Wed, 18 Sep 2019 23:23:24 -0400
Subject: [PATCH 64/89] [+] Add sign out button

---
 src/components/navigation/navigation.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/navigation/navigation.vue b/src/components/navigation/navigation.vue
index 25d11ae..bf84ba9 100644
--- a/src/components/navigation/navigation.vue
+++ b/src/components/navigation/navigation.vue
@@ -11,6 +11,9 @@
                               :key="course.name">{{course.name}}</el-menu-item>
             </el-submenu>
 
+            <el-menu-item style="float: right !important;">
+                <el-button id="sign-out-button" type="text">Sign Out</el-button>
+            </el-menu-item>
         </el-menu>
         <div class="line"></div>
     </div>

From 500e13ef9d66c601aa7af2613b205f435e5912ea Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Wed, 18 Sep 2019 23:25:12 -0400
Subject: [PATCH 65/89] [+] Add onclick to sign-out

---
 src/components/navigation/navigation.vue |  2 +-
 src/pages/overall/overall.ts             | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/navigation/navigation.vue b/src/components/navigation/navigation.vue
index bf84ba9..b327efa 100644
--- a/src/components/navigation/navigation.vue
+++ b/src/components/navigation/navigation.vue
@@ -11,7 +11,7 @@
                               :key="course.name">{{course.name}}</el-menu-item>
             </el-submenu>
 
-            <el-menu-item style="float: right !important;">
+            <el-menu-item style="float: right !important;" onclick="signOut()">
                 <el-button id="sign-out-button" type="text">Sign Out</el-button>
             </el-menu-item>
         </el-menu>
diff --git a/src/pages/overall/overall.ts b/src/pages/overall/overall.ts
index 877125d..2e956d0 100644
--- a/src/pages/overall/overall.ts
+++ b/src/pages/overall/overall.ts
@@ -110,6 +110,9 @@ export default class Overall extends Vue
         }
     }
 
+    /**
+     * This function is called to get gpa as a string.
+     */
     public getGPA()
     {
         let gpa = GPAUtils.getGPA(this.courses);
@@ -123,4 +126,11 @@ export default class Overall extends Vue
 
         return result;
     }
+
+    /**
+     * This function is called when the sign out button is clicked.
+     */
+    public signOut()
+    {
+    }
 }

From 08b665a1fa629c2d6a83ca6fbd3a43c5d6443a92 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Wed, 18 Sep 2019 23:25:25 -0400
Subject: [PATCH 66/89] [+] Call custom event to sign out

---
 src/pages/overall/overall.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/overall/overall.ts b/src/pages/overall/overall.ts
index 2e956d0..8463464 100644
--- a/src/pages/overall/overall.ts
+++ b/src/pages/overall/overall.ts
@@ -132,5 +132,7 @@ export default class Overall extends Vue
      */
     public signOut()
     {
+        // Call custom event
+        this.$emit('sign-out');
     }
 }

From 9656b3184b35e095dd24390bac50758a65883c24 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Wed, 18 Sep 2019 23:25:50 -0400
Subject: [PATCH 67/89] [O] Optimize nav bar shadow

---
 src/components/navigation/navigation.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/navigation/navigation.scss b/src/components/navigation/navigation.scss
index 6b6cea7..9c4c751 100644
--- a/src/components/navigation/navigation.scss
+++ b/src/components/navigation/navigation.scss
@@ -1,3 +1,4 @@
+
 .el-menu.centered li
 {
     display: inline-block !important;
@@ -7,7 +8,7 @@
 // Borders
 #navigation
 {
-    box-shadow: 0 0 3px #00000082;
+    box-shadow: 0 2px 12px 0 rgba(0,0,0,.1);
 
     ul
     {

From 82212cf10c6396eaf166f58f5ba8921c1a845b1b Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Thu, 19 Sep 2019 18:46:40 -0400
Subject: [PATCH 68/89] [O] Fix " warning

---
 src/components/app/app.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/app/app.ts b/src/components/app/app.ts
index cebb43c..8883d95 100644
--- a/src/components/app/app.ts
+++ b/src/components/app/app.ts
@@ -55,7 +55,7 @@ export default class App extends Vue
     public courses: Course[] = [];
 
     // Currently selected tab
-    public selectedTab: string = "overall";
+    public selectedTab: string = 'overall';
 
     // Are the course assignments loaded from the server.
     public assignmentsReady: boolean = false;

From 6cffb745a760c60138f3c156e62de6871ce58e4f Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Thu, 19 Sep 2019 18:48:17 -0400
Subject: [PATCH 69/89] [O] Specify type with ts-ignore

---
 src/pages/overall/overall.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/overall/overall.ts b/src/pages/overall/overall.ts
index 8463464..78c5ae7 100644
--- a/src/pages/overall/overall.ts
+++ b/src/pages/overall/overall.ts
@@ -8,7 +8,8 @@ import {GPAUtils} from '@/utils/gpa-utils';
 })
 export default class Overall extends Vue
 {
-    @Prop({required: true}) courses: any;
+    // @ts-ignore
+    @Prop({required: true}) courses: Course[];
 
     get convertCharts()
     {

From 608132ad6cf387b9d042a2524290628348b64b1a Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Thu, 19 Sep 2019 18:49:00 -0400
Subject: [PATCH 70/89] [O] Reduce code length

---
 src/pages/overall/overall.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/overall/overall.ts b/src/pages/overall/overall.ts
index 78c5ae7..5f7db96 100644
--- a/src/pages/overall/overall.ts
+++ b/src/pages/overall/overall.ts
@@ -18,7 +18,7 @@ export default class Overall extends Vue
 
         // Compute the column names
         let columns = ['date'];
-        this.courses.forEach((course: Course) =>
+        this.courses.forEach(course =>
         {
             // Ignore non-important courses
             if (course.status != 'active') return;
@@ -28,7 +28,7 @@ export default class Overall extends Vue
 
         // Find the min date
         let minDate: Date = new Date();
-        this.courses.forEach((course: Course) =>
+        this.courses.forEach(course =>
         {
             // Ignore non-important courses
             if (course.status != 'active') return;
@@ -50,7 +50,7 @@ export default class Overall extends Vue
         let courseScores: {[index: string]: any} = {};
         let courseMaxScores: {[index: string]: any} = {};
         let courseIndexes: {[index: string]: any} = {};
-        this.courses.forEach((course: Course) =>
+        this.courses.forEach(course =>
         {
             // Ignore non-important courses
             if (course.status != 'active') return;
@@ -68,7 +68,7 @@ export default class Overall extends Vue
             let row: {[index: string]:any} = {'date': date.toLocaleDateString('en-US')};
 
             // Loop through courses
-            this.courses.forEach((course: Course) =>
+            this.courses.forEach(course =>
             {
                 // Ignore non-important courses
                 if (course.status != 'active') return;

From 988d6f5463bc24c808fc6ddca6a6572e951242ae Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Thu, 19 Sep 2019 18:55:34 -0400
Subject: [PATCH 71/89] [+] Create method to filter out courses

---
 src/pages/overall/overall.ts | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/pages/overall/overall.ts b/src/pages/overall/overall.ts
index 5f7db96..1f8e8e2 100644
--- a/src/pages/overall/overall.ts
+++ b/src/pages/overall/overall.ts
@@ -111,6 +111,27 @@ export default class Overall extends Vue
         }
     }
 
+    /**
+     * Return a list of courses that are graphed
+     */
+    get filterCourse(): Course[]
+    {
+        // Define result
+        let result: Course[] = [];
+
+        // Filter through courses
+        this.courses.forEach(course =>
+        {
+            // Skip future or past courses
+            if (course.status != 'active') return;
+
+            // Add it to the list
+            result.push(course);
+        });
+
+        return result;
+    }
+
     /**
      * This function is called to get gpa as a string.
      */

From f6d30a750a4135e95fe8fa96c342af59eae4fbd2 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Thu, 19 Sep 2019 18:55:44 -0400
Subject: [PATCH 72/89] [+] Filter courses without levels

---
 src/pages/overall/overall.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/pages/overall/overall.ts b/src/pages/overall/overall.ts
index 1f8e8e2..47d1a28 100644
--- a/src/pages/overall/overall.ts
+++ b/src/pages/overall/overall.ts
@@ -125,6 +125,9 @@ export default class Overall extends Vue
             // Skip future or past courses
             if (course.status != 'active') return;
 
+            // Skip courses without levels
+            if (course.level == 'None') return;
+
             // Add it to the list
             result.push(course);
         });

From b4bd24d884a8bdfd2035d728623611627267d2a3 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Thu, 19 Sep 2019 18:55:55 -0400
Subject: [PATCH 73/89] [+] Filter courses without assignments

---
 src/pages/overall/overall.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/pages/overall/overall.ts b/src/pages/overall/overall.ts
index 47d1a28..7ce40a5 100644
--- a/src/pages/overall/overall.ts
+++ b/src/pages/overall/overall.ts
@@ -128,6 +128,9 @@ export default class Overall extends Vue
             // Skip courses without levels
             if (course.level == 'None') return;
 
+            // Skip courses without assignments
+            if (course.assignments.length == 0) return;
+
             // Add it to the list
             result.push(course);
         });

From f8db85dca3b23233e7961c2b26c2904a1b54d215 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Thu, 19 Sep 2019 18:57:47 -0400
Subject: [PATCH 74/89] [F] Fix getter signature problem

---
 src/pages/overall/overall.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/overall/overall.ts b/src/pages/overall/overall.ts
index 7ce40a5..da761ef 100644
--- a/src/pages/overall/overall.ts
+++ b/src/pages/overall/overall.ts
@@ -114,7 +114,7 @@ export default class Overall extends Vue
     /**
      * Return a list of courses that are graphed
      */
-    get filterCourse(): Course[]
+    private filterCourses(): Course[]
     {
         // Define result
         let result: Course[] = [];

From 8559a93b9c925a77293919100fc229fa9283d9eb Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Thu, 19 Sep 2019 18:58:00 -0400
Subject: [PATCH 75/89] [+] Filter courses to a variable

---
 src/pages/overall/overall.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/pages/overall/overall.ts b/src/pages/overall/overall.ts
index da761ef..2cd4cd3 100644
--- a/src/pages/overall/overall.ts
+++ b/src/pages/overall/overall.ts
@@ -16,6 +16,9 @@ export default class Overall extends Vue
         // Null case
         if (this.courses == null) return [];
 
+        // Filter it
+        let courses: Course[] = this.filterCourses();
+
         // Compute the column names
         let columns = ['date'];
         this.courses.forEach(course =>

From 88bdcd8cf88fb64784fbbeed0c99bdc2e9b80f06 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Thu, 19 Sep 2019 18:58:59 -0400
Subject: [PATCH 76/89] [O] Optimize code length

---
 src/pages/overall/overall.ts | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/pages/overall/overall.ts b/src/pages/overall/overall.ts
index 2cd4cd3..0e01b8d 100644
--- a/src/pages/overall/overall.ts
+++ b/src/pages/overall/overall.ts
@@ -21,21 +21,15 @@ export default class Overall extends Vue
 
         // Compute the column names
         let columns = ['date'];
-        this.courses.forEach(course =>
+        courses.forEach(course =>
         {
-            // Ignore non-important courses
-            if (course.status != 'active') return;
-
             columns.push(course.name);
         });
 
         // Find the min date
         let minDate: Date = new Date();
-        this.courses.forEach(course =>
+        courses.forEach(course =>
         {
-            // Ignore non-important courses
-            if (course.status != 'active') return;
-
             if (course.assignments.length == 0) return;
             let date = new Date(course.assignments[course.assignments.length - 1].date);
             if (date < minDate) minDate = date;
@@ -53,11 +47,8 @@ export default class Overall extends Vue
         let courseScores: {[index: string]: any} = {};
         let courseMaxScores: {[index: string]: any} = {};
         let courseIndexes: {[index: string]: any} = {};
-        this.courses.forEach(course =>
+        courses.forEach(course =>
         {
-            // Ignore non-important courses
-            if (course.status != 'active') return;
-
             courseScores[course.name] = 0;
             courseMaxScores[course.name] = 0;
             courseIndexes[course.name] = course.assignments.length - 1;
@@ -71,11 +62,8 @@ export default class Overall extends Vue
             let row: {[index: string]:any} = {'date': date.toLocaleDateString('en-US')};
 
             // Loop through courses
-            this.courses.forEach(course =>
+            courses.forEach(course =>
             {
-                // Ignore non-important courses
-                if (course.status != 'active') return;
-
                 // Reversed loop through the assignments
                 for (let r = courseIndexes[course.name]; r >= 0; r--)
                 {

From 22ba3acab042c9d3108bbd321f391e3f27ae5761 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Thu, 19 Sep 2019 19:11:00 -0400
Subject: [PATCH 77/89] [F] Fix key word typo

---
 src/utils/json-utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/json-utils.ts b/src/utils/json-utils.ts
index f5ab995..f33dfa2 100644
--- a/src/utils/json-utils.ts
+++ b/src/utils/json-utils.ts
@@ -19,7 +19,7 @@ export default class JsonUtils
                 type: assignment.assignment_type,
                 description: assignment.assignment_description,
                 date: assignment._date,
-                complete: assignment.complete_status,
+                complete: assignment.completion_status,
                 include: assignment.include_in_calculated_grade == 1,
                 display: assignment.display_grade == 1,
 

From cef0b31dba565a571f542b0a0f31af2b3da3dace Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Thu, 19 Sep 2019 19:11:54 -0400
Subject: [PATCH 78/89] [O] Only display score when it is complete

---
 src/pages/overall/overall.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/overall/overall.ts b/src/pages/overall/overall.ts
index 0e01b8d..d147629 100644
--- a/src/pages/overall/overall.ts
+++ b/src/pages/overall/overall.ts
@@ -68,9 +68,12 @@ export default class Overall extends Vue
                 for (let r = courseIndexes[course.name]; r >= 0; r--)
                 {
                     let assignment = course.assignments[r];
-                    let assignmentDate = new Date(assignment.date);
+
+                    // If assignment should be displayed
+                    if (assignment.complete != 'Complete') continue;
 
                     // Date is being looked at
+                    let assignmentDate = new Date(assignment.date);
                     if (assignmentDate.getTime() == date.getTime())
                     {
                         // Record scores

From 204e7dc04a7e75706fb89cfb1d165d517776b1ac Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Fri, 20 Sep 2019 18:50:13 -0400
Subject: [PATCH 79/89] [F] Move signOut() to the right place

---
 src/components/navigation/navigation.ts | 9 +++++++++
 src/pages/overall/overall.ts            | 9 ---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/navigation/navigation.ts b/src/components/navigation/navigation.ts
index 861ad02..6678b27 100644
--- a/src/components/navigation/navigation.ts
+++ b/src/components/navigation/navigation.ts
@@ -27,4 +27,13 @@ export default class Navigation extends Vue
         // Call custom event
         this.$emit('navigation:select', this.activeIndex);
     }
+
+    /**
+     * This function is called when the sign out button is clicked.
+     */
+    public signOut()
+    {
+        // Call custom event
+        this.$emit('sign-out');
+    }
 }
diff --git a/src/pages/overall/overall.ts b/src/pages/overall/overall.ts
index d147629..ca498e8 100644
--- a/src/pages/overall/overall.ts
+++ b/src/pages/overall/overall.ts
@@ -148,13 +148,4 @@ export default class Overall extends Vue
 
         return result;
     }
-
-    /**
-     * This function is called when the sign out button is clicked.
-     */
-    public signOut()
-    {
-        // Call custom event
-        this.$emit('sign-out');
-    }
 }

From ebd48497038198349271ea22ee5bf4fcc79e3d14 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Fri, 20 Sep 2019 19:10:12 -0400
Subject: [PATCH 80/89] [O] Optimize sign out button

---
 src/components/navigation/navigation.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/navigation/navigation.vue b/src/components/navigation/navigation.vue
index b327efa..30bbf58 100644
--- a/src/components/navigation/navigation.vue
+++ b/src/components/navigation/navigation.vue
@@ -11,9 +11,7 @@
                               :key="course.name">{{course.name}}</el-menu-item>
             </el-submenu>
 
-            <el-menu-item style="float: right !important;" onclick="signOut()">
-                <el-button id="sign-out-button" type="text">Sign Out</el-button>
-            </el-menu-item>
+            <el-button @click="signOut" id="sign-out-button" type="text">Sign Out</el-button>
         </el-menu>
         <div class="line"></div>
     </div>

From 24328508c0849cbcadf82018153a7d1f03dc0783 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Fri, 20 Sep 2019 19:10:23 -0400
Subject: [PATCH 81/89] [+] Bind sign out event

---
 src/components/app/app.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/app/app.vue b/src/components/app/app.vue
index 17879e9..31f572c 100644
--- a/src/components/app/app.vue
+++ b/src/components/app/app.vue
@@ -1,7 +1,10 @@
 <template>
     <div id="app">
         <login v-if="showLogin" v-on:login:token="onLogin" :http="http"></login>
-        <navigation :courses="courses" v-on:navigation:select="onNavigate"></navigation>
+        <navigation :courses="courses"
+                    v-on:sign-out="signOut()"
+                    v-on:navigation:select="onNavigate">
+        </navigation>
 
         <div id="app-content">
             <overall :courses="courses" v-if="selectedTab === 'overall' && assignmentsReady"></overall>

From df639a360c707569b0c4a71547668b394e773cff Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Fri, 20 Sep 2019 19:10:37 -0400
Subject: [PATCH 82/89] [+] Implement actual sign out function

---
 src/components/app/app.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/components/app/app.ts b/src/components/app/app.ts
index 8883d95..55945f7 100644
--- a/src/components/app/app.ts
+++ b/src/components/app/app.ts
@@ -185,4 +185,13 @@ export default class App extends Vue
         // Update selected tab
         this.selectedTab = tab;
     }
+
+    /**
+     * Sign out
+     */
+    public signOut()
+    {
+        // Clear all cookies
+        this.$cookies.keys().forEach(key => this.$cookies.remove(key));
+    }
 }

From ac8f488ab475d961f28137b1719d6c352cbef45e Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Fri, 20 Sep 2019 19:21:07 -0400
Subject: [PATCH 83/89] [O] Refresh page after signing out

---
 src/components/app/app.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/app/app.ts b/src/components/app/app.ts
index 55945f7..cc5bc31 100644
--- a/src/components/app/app.ts
+++ b/src/components/app/app.ts
@@ -193,5 +193,8 @@ export default class App extends Vue
     {
         // Clear all cookies
         this.$cookies.keys().forEach(key => this.$cookies.remove(key));
+
+        // Refresh
+        window.location.reload();
     }
 }

From 8c4759d497ca73f6c6e738d08110cebbeaf448da Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Fri, 20 Sep 2019 19:26:23 -0400
Subject: [PATCH 84/89] [-] Remove unnecessary sample chart data

---
 src/pages/overall/graph-overall/graph-overall.ts | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/pages/overall/graph-overall/graph-overall.ts b/src/pages/overall/graph-overall/graph-overall.ts
index a92746c..88be04f 100644
--- a/src/pages/overall/graph-overall/graph-overall.ts
+++ b/src/pages/overall/graph-overall/graph-overall.ts
@@ -6,17 +6,4 @@ import {Course} from '@/components/app/app';
 export default class GraphOverall extends Vue
 {
     @Prop({required: true}) chart: any;
-
-    public chartData =
-    {
-        columns: ['日期', '访问用户', '下单用户', '下单率'],
-        rows: [
-            { '日期': '1/1', '访问用户': 1393, '下单用户': 1093, '下单率': 0.32 },
-            { '日期': '1/2', '访问用户': 3530, '下单用户': 3230, '下单率': 0.26 },
-            { '日期': '1/3', '访问用户': 2923, '下单用户': 2623, '下单率': 0.76 },
-            { '日期': '1/4', '访问用户': 1723, '下单用户': 1423, '下单率': 0.49 },
-            { '日期': '1/5', '访问用户': 3792, '下单用户': 3492, '下单率': 0.323 },
-            { '日期': '1/6', '访问用户': 4593, '下单用户': 4293, '下单率': 0.78 }
-        ]
-    };
 }

From cadd328958ce658770eac2c72589d9c9e4b28cf0 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Fri, 20 Sep 2019 19:27:10 -0400
Subject: [PATCH 85/89] [O] Separate settings

---
 src/pages/overall/graph-overall/graph-overall.ts  | 8 ++++++++
 src/pages/overall/graph-overall/graph-overall.vue | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/pages/overall/graph-overall/graph-overall.ts b/src/pages/overall/graph-overall/graph-overall.ts
index 88be04f..66aa592 100644
--- a/src/pages/overall/graph-overall/graph-overall.ts
+++ b/src/pages/overall/graph-overall/graph-overall.ts
@@ -6,4 +6,12 @@ import {Course} from '@/components/app/app';
 export default class GraphOverall extends Vue
 {
     @Prop({required: true}) chart: any;
+
+    private settings =
+    {
+        series:
+        {
+            smooth: false
+        }
+    }
 }
diff --git a/src/pages/overall/graph-overall/graph-overall.vue b/src/pages/overall/graph-overall/graph-overall.vue
index 5e64694..ba96600 100644
--- a/src/pages/overall/graph-overall/graph-overall.vue
+++ b/src/pages/overall/graph-overall/graph-overall.vue
@@ -1,6 +1,6 @@
 <template>
     <div id="graph-overall">
-        <ve-line :data="chart" :extend="{series: {smooth: false}}"></ve-line>
+        <ve-line :data="chart" :extend="settings"></ve-line>
     </div>
 </template>
 

From 9e88f3efe1237e3c8f370401778d127b522dfb03 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Mon, 23 Sep 2019 19:32:21 -0400
Subject: [PATCH 86/89] [U] Ignore 0 grades in calculations

---
 src/utils/gpa-utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/gpa-utils.ts b/src/utils/gpa-utils.ts
index ae8b48b..550a2b3 100644
--- a/src/utils/gpa-utils.ts
+++ b/src/utils/gpa-utils.ts
@@ -42,7 +42,7 @@ export class GPAUtils
         // Remove all courses that does not have a grade
         coursesOriginal.forEach(course =>
         {
-            if (course.numericGrade == null)
+            if (course.numericGrade == null || course.numericGrade == 0)
             {
                 accurate = false;
             }

From f043d77e5eab211d8dbd3615dc0f6313e60ffe8b Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Mon, 23 Sep 2019 19:32:37 -0400
Subject: [PATCH 87/89] [M] Move graph title to the graph component

---
 src/pages/overall/graph-overall/graph-overall.vue | 1 +
 src/pages/overall/overall.vue                     | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/overall/graph-overall/graph-overall.vue b/src/pages/overall/graph-overall/graph-overall.vue
index ba96600..a6cba7c 100644
--- a/src/pages/overall/graph-overall/graph-overall.vue
+++ b/src/pages/overall/graph-overall/graph-overall.vue
@@ -1,5 +1,6 @@
 <template>
     <div id="graph-overall">
+        <p>Your average score graph all time:</p>
         <ve-line :data="chart" :extend="settings"></ve-line>
     </div>
 </template>
diff --git a/src/pages/overall/overall.vue b/src/pages/overall/overall.vue
index cedbaa7..5ca4ef6 100644
--- a/src/pages/overall/overall.vue
+++ b/src/pages/overall/overall.vue
@@ -17,7 +17,6 @@
             </el-col>
             <el-col :span="20">
                 <el-card style="margin-right: 20px">
-                    <p>Your average score graph all time:</p>
                     <graph-overall :chart="convertCharts"></graph-overall>
                 </el-card>
             </el-col>

From 352fd58fb5862172f69236157bd8957613365efc Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Mon, 23 Sep 2019 19:33:27 -0400
Subject: [PATCH 88/89] [O] Show the graph with minimum y axis at 70

---
 src/pages/overall/graph-overall/graph-overall.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/pages/overall/graph-overall/graph-overall.ts b/src/pages/overall/graph-overall/graph-overall.ts
index 66aa592..d85013c 100644
--- a/src/pages/overall/graph-overall/graph-overall.ts
+++ b/src/pages/overall/graph-overall/graph-overall.ts
@@ -12,6 +12,10 @@ export default class GraphOverall extends Vue
         series:
         {
             smooth: false
+        },
+        yAxis:
+        {
+            min: 70
         }
     }
 }

From fa3fc445268145ff26e9ae2d4dae7c6947cdda8c Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Mon, 23 Sep 2019 19:41:49 -0400
Subject: [PATCH 89/89] [U] Update version number

---
 src/constants.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/constants.ts b/src/constants.ts
index 6a32eb2..f34f33e 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -14,5 +14,5 @@ export default class Constants
         '|    |.  ,    |---|,---.,---.|    ,   .,---,,---.,---.\n' +
         ' \\  /  ><     |   ||   |,---||    |   | .-\' |---\'|    \n' +
         '  `\'  \'  `    `   \'`   \'`---^`---\'`---|\'---\'`---\'`    \n' +
-        '      v1.1.0                      `---\'               '
+        '      v0.1.1.0                    `---\'               '
 }