[U] Pre-release v0.3.1.382

This reverts commit d254706a21.

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 HyDEV
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,6 +1,38 @@
-# veracross-analyzer
+<h1 align="center"><br><br>
+  VeracrossAnalyzer UI
+</h1>
 
-## Project setup
+<h4 align="center">
+  A Website, A Visual Representation of Students' Grade Data on Veracross
+</h4>
+
+<h5 align="center">
+  <a href="#intro">Introduction</a>&nbsp;&nbsp;
+  <a href="#setup">Project Setup</a>&nbsp;&nbsp;
+  <a href="#license">License</a>
+</h5><br><br><br>
+
+
+
+<a name="intro"></a>
+Introduction:
+--------
+
+This is a website that generates visual representation of students' grade data on Veracross. Currently there is only one graph and one numerical data representing the GPA. But also it just released yesterday! (Yay!) What do you expect this soon lol?
+
+**Here's how it looks like right now:** *(Now all of you know my grades ;-;)*
+
+![](https://user-images.githubusercontent.com/22280294/65841599-155ead00-e2f2-11e9-9d9f-c2f23c45d9a4.png)
+
+<br>
+
+<a name="setup"></a>
+Project Setup:
+--------
+
+TODO: Actually write a project setup tutorial that's not generated by Vue on initialization ;-;.
+
+### Install
 ```
 npm install
 ```
@@ -15,15 +47,10 @@ npm run serve
 npm run build
 ```
 
-### Run your tests
-```
-npm run test
-```
+<br>
 
-### Lints and fixes files
-```
-npm run lint
-```
+<a name="license"></a>
+License: [MIT](https://choosealicense.com/licenses/mit/)
+--------
 
-### Customize configuration
-See [Configuration Reference](https://cli.vuejs.org/config/).
+The MIT license basically means that this project is open-soucred and you can do whatever you want with it, as long as you include a copy of this license in your distribution. You don't have to ask for permissions to use or anything. However, if you do bad things with it, I'm not responsible.

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",

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": {

run/deploy.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# abort on errors
+set -e
+
+# build
+npm run build
+
+# navigate into the build output directory
+cd dist
+
+# if you are deploying to a custom domain
+echo 'vera.hydev.org' > CNAME
+
+git init
+git add -A
+git commit -m 'deploy'
+
+# if you are deploying to https://<USERNAME>.github.io/<REPO>
+git push -f git@github.com:HyDevelop/VeracrossAnalyzer.Client.git master:gh-pages
+
+cd -

src/components/app/app.scss

@@ -1,8 +1,14 @@
 #app
 {
-  font-family: 'Avenir', Helvetica, Arial, sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  text-align: center;
-  color: #2c3e50;
+    font-family: 'Avenir', Helvetica, Arial, sans-serif;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+    text-align: center;
+    color: #2c3e50;
+}
+
+.theme-default
+{
+    --unread: #ff6c00;
+    --main: #0c6dad;
 }

src/components/app/app.ts

@@ -5,12 +5,16 @@ 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';
+import {CourseUtils} from '@/utils/course-utils';
+import {GPAUtils} from '@/utils/gpa-utils';
 
 /**
  * Objects of this interface represent assignment grades.
  */
-export interface Grade
+export interface Assignment
 {
+    id: number,
     type: string,
     description: string,
     date: string,
@@ -18,6 +22,8 @@ export interface Grade
     include: boolean,
     display: boolean,
 
+    unread: boolean,
+
     scoreMax: number,
     score: number
 }
@@ -31,8 +37,21 @@ export interface Course
     id: number,
     name: string,
     teacherName: string,
+    status: string,
 
-    assignments: Grade[]
+    letterGrade?: string,
+    numericGrade?: number,
+
+    level: string,
+    scaleUp: number,
+
+    grading:
+    {
+        method: string,
+        weightingMap: {[index: string]: number}
+    }
+
+    assignments: Assignment[]
 }
 
 @Component({
@@ -46,52 +65,110 @@ export default class App extends Vue
     // List of course that the student takes
     public courses: Course[] = [];
 
+    // List of course that should be displayed
+    public filteredCourses: Course[] = [];
+
     // Currently selected tab
-    public selectedTab: string = "overall";
+    public selectedTab: string = 'overall';
 
     // Are the course assignments loaded from the server.
     public assignmentsReady: boolean = false;
 
+    // Token
+    public token: string = '';
+
+    // Http Client
+    public http: HttpUtils = new HttpUtils('');
+
+    /**
+     * This is called when the instance is created.
+     */
+    public created()
+    {
+        // Show splash
+        console.log(Constants.SPLASH);
+    }
+
     /**
      * 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;
 
-        // Assign courses
-        this.courses = courses;
+        // Store token
+        this.token = token;
 
-        // Debug output TODO: Remove this
-        console.log(courses);
+        // Assign token to http client
+        this.http.token = token;
 
+        // Load data
+        this.loadCoursesAfterLogin();
+    }
+
+    /**
+     * Load courses data after login.
+     */
+    public loadCoursesAfterLogin()
+    {
+        this.http.post('/courses', {}).then(response =>
+        {
+            // 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 the assignments of the courses
+     */
+    public loadAssignments()
+    {
         // 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 =>
+            this.http.post('/assignments', {id: course.assignmentsId}).then(response =>
             {
-                // Get response body text
-                res.text().then(text =>
+                // Check success
+                if (response.success)
                 {
+                    // Load assignments
                     // Parse json and filter it
-                    course.assignments = JsonUtils.filterAssignments(JSON.parse(text));
-                })
+                    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.
         pWaitFor(() => this.isAssignmentsReady()).then(() =>
         {
-            // When the assignments are ready
-            this.assignmentsReady = true;
+            // Filter courses
+            this.filteredCourses = CourseUtils.getGradedCourses(this.courses);
+
+            // Check grading algorithms
+            this.checkGradingAlgorithms();
         });
     }
 
@@ -110,6 +187,67 @@ export default class App extends Vue
         return true;
     }
 
+    /**
+     * Check the courses' grading algorithms. (Total-average or percent-type)
+     */
+    private checkGradingAlgorithms()
+    {
+        // Loop through all the courses
+        for (const course of this.filteredCourses)
+        {
+            // Check if total-average grade is the same with percent-type grade
+            if (course.numericGrade == GPAUtils.getTotalMeanAverage(course))
+            {
+                course.grading = {method: 'TOTAL_AVERAGE', weightingMap: {}};
+            }
+            else
+            {
+                // Request grading scheme for this course
+                this.http.post('/grading', {'assignment_id': course.assignmentsId}).then(response =>
+                {
+                    // Check success
+                    if (response.success)
+                    {
+                        // Add it to course
+                        course.grading = response.data;
+                    }
+                    else
+                    {
+                        // Show error message TODO: Show it properly
+                        alert(response.data)
+                    }
+                })
+                .catch(alert)
+            }
+        }
+
+        // Wait for done
+        pWaitFor(() => this.isGradingReady()).then(() =>
+        {
+            // When the assignments are ready
+            // TODO: Display loading
+            this.assignmentsReady = true;
+        })
+    }
+
+    /**
+     * Are grading algorithms ready or not.
+     *
+     * @returns boolean Ready or not
+     */
+    private isGradingReady(): boolean
+    {
+        for (const course of this.filteredCourses)
+        {
+            if (course.grading == undefined)
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     /**
      * This is called when a navigation tab is clicked
      *
@@ -123,4 +261,16 @@ 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));
+
+        // Refresh
+        window.location.reload();
+    }
 }

src/components/app/app.vue

@@ -1,10 +1,15 @@
 <template>
-    <div id="app">
-        <login v-if="showLogin" v-on:login:courses="onLogin"></login>
-        <navigation :courses="courses" v-on:navigation:select="onNavigate"></navigation>
+    <div id="app" class="theme-default">
+        <login v-if="showLogin" v-on:login:token="onLogin" :http="http"></login>
+        <navigation :courses="filteredCourses"
+                    v-on:sign-out="signOut()"
+                    v-on:navigation:select="onNavigate">
+        </navigation>
 
         <div id="app-content">
-            <overall :courses="courses" v-if="selectedTab === 'overall' && assignmentsReady"></overall>
+            <overall :courses="filteredCourses"
+                     v-if="selectedTab === 'overall' && assignmentsReady">
+            </overall>
         </div>
     </div>
 </template>

src/components/login/login.scss

@@ -72,3 +72,28 @@
         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;
+    }
+}
+
+// Fix error message
+.el-form-item__error.custom
+{
+    padding-top: 0;
+    position: relative;
+    top: auto;
+    float: left;
+}

src/components/login/login.ts

@@ -1,8 +1,10 @@
-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.
+ * TODO: Press enter to login
  */
 @Component({
     components: {},
@@ -13,6 +15,23 @@ export default class Login extends Vue
     public password: any = '';
 
     public loading: boolean = false;
+    public error: String = '';
+
+    @Prop()
+    public http?: HttpUtils;
+
+    /**
+     * 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.
@@ -22,15 +41,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}/veracross/courses`).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)
             {
-                // Call custom event with courses info
-                this.$emit('login:courses', JSON.parse(text));
-            })
+                // 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;
+
+                // Allow the user to retry
+                this.loading = false;
+            }
         })
         .catch(err =>
         {
@@ -40,4 +71,12 @@ export default class Login extends Vue
             this.loading = false;
         });
     }
+
+    /**
+     * This is called when the user hits enter in the input boxes.
+     */
+    public onEnter()
+    {
+        this.onLoginClick();
+    }
 }

src/components/login/login.vue

@@ -3,9 +3,24 @@
         <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 !== ''}"
+                          @keyup.enter.native="onEnter">
+                </el-input>
+
+                <el-input v-model="password"
+                          placeholder="Veracross Password"
+                          show-password=""
+                          :class="{'input-error': error !== ''}"
+                          @keyup.enter.native="onEnter">
+                </el-input>
+
+                <div class="el-form-item__error custom">{{error}}</div>
+
                 <el-button plain type="primary" @click="onLoginClick" :loading="loading">Login</el-button>
             </div>
         </div>

src/components/navigation/navigation.scss

@@ -1,5 +1,50 @@
+
 .el-menu.centered li
 {
     display: inline-block !important;
     float: none !important;
 }
+
+// Borders
+#navigation
+{
+    box-shadow: 0 2px 12px 0 rgba(0,0,0,.1);
+
+    ul
+    {
+        border-bottom-width: 0;
+    }
+}
+
+#sign-out-button
+{
+    // Float right
+    position: absolute;
+    right: 0;
+
+    // Set width and height
+    height: 60px;
+    width: 110px;
+}
+
+#nav-title
+{
+    // Float left
+    position: absolute;
+    left: 0;
+
+    // Set height
+    height: 60px;
+
+    // Center text
+    align-items: center;
+
+    // Margins
+    margin-left: 14px;
+    margin-right: 8px;
+
+    // Font
+    font-size: 1.25rem;
+    display: inline-flex;
+
+}

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');
+    }
 }

src/components/navigation/navigation.vue

@@ -1,6 +1,11 @@
 <template>
     <div id="navigation">
-        <el-menu class="centered" :default-active="activeIndex" mode="horizontal" @select="onSelect">
+        <el-menu style="margin-bottom: 10px;"
+                 class="centered" :default-active="activeIndex" mode="horizontal" @select="onSelect">
+
+            <!--div id="nav-title">
+                Veracross Analyzer
+            </div-->
 
             <el-menu-item index="overall">Overall</el-menu-item>
 
@@ -11,6 +16,7 @@
                               :key="course.name">{{course.name}}</el-menu-item>
             </el-submenu>
 
+            <el-button @click="signOut" id="sign-out-button" type="text">Sign Out</el-button>
         </el-menu>
         <div class="line"></div>
     </div>

src/constants.ts

@@ -5,7 +5,45 @@ 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';
+
+    public static VERSION: string = '0.3.1.382';
+
+    public static GITHUB: string = 'https://github.com/HyDevelop/VeracrossAnalyzer.Client';
+
+    public static SPLASH: string =
+        '.    ,        ,---.          |                        \n' +
+        '|    |.  ,    |---|,---.,---.|    ,   .,---,,---.,---.\n' +
+        ' \\  /  ><     |   ||   |,---||    |   | .-\' |---\'|    \n' +
+        '  `\'  \'  `    `   \'`   \'`---^`---\'`---|\'---\'`---\'`    \n' +
+        '                                  `---\'               \n' +
+        ` Version v${Constants.VERSION} by Hykilpikonna (YGui21)\n` +
+        ` Github: ${Constants.GITHUB}`;
+
+    // Graph Theme
+    public static THEME =
+    {
+        // Colors
+        colors:
+        [
+            '#18cea5',
+            '#4fa8ed',
+            '#f9627b',
+            '#ffb075',
+            '#005c9c',
+            '#bcabe0',
+            '#d36e75',
+            '#fc97af',
+            '#919e8b',
+            '#d7ab82',
+            '#6e7074',
+            '#61a0a8',
+            '#efa18d',
+            '#787464',
+            '#cc7e63',
+            '#724e58',
+            '#4b565b'
+        ]
+    }
 }

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),

src/pages/overall/graph-overall/graph-overall.ts

@@ -1,22 +0,0 @@
-import {Component, Prop, Vue} from 'vue-property-decorator';
-import {Course} from '@/components/app/app';
-
-@Component({
-})
-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 }
-        ]
-    };
-}

src/pages/overall/graph-overall/graph-overall.vue

@@ -1,8 +0,0 @@
-<template>
-    <div id="graph-overall">
-        <ve-line :data="chart" :extend="{series: {smooth: false}}"></ve-line>
-    </div>
-</template>
-
-<script src="./graph-overall.ts" lang="ts"></script>
-<style src="./graph-overall.scss" lang="scss"></style>

src/pages/overall/overall-bar/overall-bar.scss

@@ -0,0 +1,7 @@
+#overall-bar
+{
+    .graph
+    {
+        margin-top: 50px;
+    }
+}

src/pages/overall/overall-bar/overall-bar.ts

@@ -0,0 +1,109 @@
+import {Component, Prop, Vue} from 'vue-property-decorator';
+import {Course} from '@/components/app/app';
+import {GPAUtils} from '@/utils/gpa-utils';
+import Constants from '@/constants';
+
+@Component({
+})
+export default class OverallBar extends Vue
+{
+    // @ts-ignore
+    @Prop({required: true}) courses: Course[];
+
+    /**
+     * Generate settings
+     */
+    get chartSettings()
+    {
+        let settings =
+        {
+            // Title
+            title:
+            {
+                show: true,
+                textStyle:
+                {
+                    fontSize: 12
+                },
+                text: 'Course GPA',
+                subtext: 'Current GPA for every course',
+                x: 'center'
+            },
+
+            // X axis represents course names
+            xAxis:
+            {
+                type: 'category',
+                axisLabel: {
+                    interval: 0,
+                    inside: false,
+                    rotate: 90,
+
+                    // Truncate text length
+                    formatter: (value: string) => value.length <= 16 ? value : value.substr(0, 14) + '...'
+                },
+            },
+
+            // Y axis represents GPAs and MaxGPAs
+            yAxis:
+            {
+                type: 'value'
+            },
+
+            // Data
+            series:
+            [
+                {
+                    type: 'bar',
+                    barGap: '-100%',
+                    data: this.courses.map(course =>
+                    {
+                        return {value: [course.name, GPAUtils.getGP(course, 'A+')],
+                            itemStyle: {color: '#d8d8d8'}}
+                    }),
+                },
+                {
+                    type: 'bar',
+                    barGap: '-100%',
+                    data: this.generateGPData(),
+
+                    label:
+                    {
+                        show: true,
+                        rotate: 90
+                    }
+                }
+            ],
+
+            // Disable tooltip
+            tooltip:
+            {
+                show: false
+            }
+        };
+
+        return settings;
+    }
+
+    /**
+     * Generate GP data for each course
+     */
+    private generateGPData()
+    {
+        let data: any = [];
+
+        this.courses.forEach(course =>
+        {
+            data.push(
+            {
+                value: [course.name, GPAUtils.getGP(course, course.letterGrade)],
+                itemStyle:
+                {
+                    color: Constants.THEME.colors[data.length]
+                }
+            });
+        });
+
+        return data;
+    }
+}

src/pages/overall/overall-bar/overall-bar.vue

@@ -0,0 +1,9 @@
+<template>
+    <div id="overall-bar">
+        <ve-bar height="450px" class="graph"
+                :extend="chartSettings"></ve-bar>
+    </div>
+</template>
+
+<script src="./overall-bar.ts" lang="ts"></script>
+<style src="./overall-bar.scss" lang="scss"></style>

src/pages/overall/overall-course/overall-course.scss

@@ -0,0 +1,106 @@
+// Card
+.el-card.course-card
+{
+    // Margins
+    margin-right: 20px;
+    margin-left: 20px;
+
+    // Height limit
+    max-height: 90px;
+
+    // Limit name length
+    white-space: nowrap;
+}
+
+.course-col-name
+{
+    // Align left
+    text-align: left;
+    float: left;
+
+    .course-name
+    {
+        overflow: hidden;
+        font-size: 22px;
+        color: var(--main);
+    }
+
+    .course-name:hover
+    {
+        text-decoration: underline;
+    }
+
+    .course-teacher
+    {
+        font-size: 12px;
+        color: #999999;
+        font-style: italic;
+    }
+}
+
+.course-col-grade
+{
+    // Align right
+    text-align: right;
+    float: right;
+
+    // Adjust position
+    margin-top: -2px;
+
+    .course-grade
+    {
+        font-size: 21px;
+    }
+
+    .course-updates
+    {
+        font-size: 14px;
+
+        .unread-number
+        {
+            display: inline-block;
+            width: 20px;
+            text-align: center;
+            border-radius: 5px;
+
+            padding-left: 3px;
+            padding-right: 3px;
+
+            margin-right: 3px;
+        }
+
+        .unread-text
+        {
+            font-style: italic;
+        }
+    }
+
+    .course-updates.unread
+    {
+        .unread-number
+        {
+            background: var(--unread);
+            color: white;
+        }
+
+        .unread-text
+        {
+            color: var(--unread);
+        }
+    }
+
+    .course-updates.none
+    {
+        color: #999999;
+
+        .unread-number
+        {
+            background: #eeeeee;
+        }
+    }
+}
+
+.el-card__body
+{
+    margin: auto 0;
+}

src/pages/overall/overall-course/overall-course.ts

@@ -0,0 +1,26 @@
+import {Component, Prop, Vue} from 'vue-property-decorator';
+import {Course} from '@/components/app/app';
+import {GPAUtils} from '@/utils/gpa-utils';
+import Constants from '@/constants';
+
+@Component({
+})
+export default class OverallCourse extends Vue
+{
+    // @ts-ignore
+    @Prop({required: true}) course: Course;
+
+    private unread: number = -1;
+
+    /**
+     * Count the number of unread assignments with cache
+     */
+    countUnread(): number
+    {
+        if (this.unread == -1)
+        {
+            return this.unread = this.course.assignments.filter(a => a.unread).length;
+        }
+        else return this.unread;
+    }
+}

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

@@ -0,0 +1,37 @@
+<template>
+    <div id="overall-course">
+        <el-card class="course-card">
+            <el-row>
+                <el-col :span="6" class="course-col-name">
+                    <div class="course-name">
+                        {{course.name}}
+                    </div>
+                    <div class="course-teacher">
+                        {{course.teacherName}}
+                    </div>
+                </el-col>
+                <el-col :span="12">
+                    &nbsp;
+                </el-col>
+                <el-col :span="6" class="course-col-grade">
+                    <div class="course-grade">
+                        <span class="letter">{{course.letterGrade}} </span>
+                        <span class="numeric">{{course.numericGrade.toFixed(2)}}</span>
+                        <span class="percent">%</span>
+                    </div>
+                    <div class="course-updates" :class="countUnread() === 0 ? 'none' : 'unread'">
+                        <span class="unread-number">
+                            {{countUnread()}}
+                        </span>
+                        <span class="unread-text">
+                            new update{{countUnread() >= 2 ? 's' : ''}}
+                        </span>
+                    </div>
+                </el-col>
+            </el-row>
+        </el-card>
+    </div>
+</template>
+
+<script src="./overall-course.ts" lang="ts"></script>
+<style src="./overall-course.scss" lang="scss"></style>

src/pages/overall/overall-line/overall-line.ts

@@ -0,0 +1,179 @@
+import {Component, Prop, Vue} from 'vue-property-decorator';
+import {Course} from '@/components/app/app';
+
+@Component({
+})
+export default class OverallLine extends Vue
+{
+    // @ts-ignore
+    @Prop({required: true}) courses: Course[];
+
+    private settings =
+    {
+        // Title
+        title:
+        {
+            show: true,
+            textStyle:
+            {
+                fontSize: 12
+            },
+            text: 'Average Grade',
+            subtext: 'Average score trend for every course',
+            x: 'center'
+        },
+        // Legend
+        legend:
+        {
+            show: false,
+            //left: 'auto',
+            //align: 'left',
+            //orient: 'vertical'
+            textStyle:
+            {
+                fontSize: 11
+            },
+            icon: 'circle'
+        },
+        // Zoom bar
+        dataZoom:
+        [
+            // TODO: Calculate real value for startValue
+            {
+                startValue: '9/13/2019'
+            },
+            {
+                type: 'inside'
+            }
+        ],
+        series:
+        {
+            smooth: true
+        },
+        xAxis:
+        {
+            //type: 'time'
+        },
+        yAxis:
+        {
+            min: (value: any) => value.min - 10
+        }
+    };
+
+    /**
+     * Convert assignments list to a graph dataset.
+     */
+    get convertChart()
+    {
+        let courses = this.courses;
+
+        // Compute the column names
+        let columns = courses.map(course => course.name);
+        columns.unshift('date');
+
+        // Find the min date
+        let minDates = courses.map(course => new Date(course.assignments[course.assignments.length - 1].date).getTime());
+        let minDate: Date = new Date(Math.min.apply(null, minDates));
+
+        // Find the dates in between
+        let now = new Date();
+        let dates = [];
+        for (let date = minDate; date <= now; date.setDate(date.getDate() + 1))
+        {
+            dates.push(new Date(date));
+        }
+
+        // Compute the rows data
+        let rows: {[index: string]: any}[] = [];
+        dates.forEach(date =>
+        {
+            // Define row object
+            let row: {[index: string]:any} = {'date': date.toLocaleDateString('en-US')};
+
+            // Loop through courses
+            courses.forEach(course =>
+            {
+                // Total Mean
+                if (course.grading.method == 'TOTAL_MEAN')
+                {
+                    let score = 0;
+                    let max = 0;
+
+                    // Loop through assignments
+                    course.assignments.forEach(assignment =>
+                    {
+                        // If assignment should be displayed
+                        if (assignment.complete != 'Complete') return;
+
+                        // Date is being looked at
+                        let assignmentDate = new Date(assignment.date);
+                        if (assignmentDate.getTime() < date.getTime())
+                        {
+                            // Record scores
+                            score += assignment.score;
+                            max += assignment.scoreMax;
+                        }
+                    });
+
+                    // Add average to the row
+                    row[course.name] = score / max * 100;
+                }
+                else if (course.grading.method == 'PERCENT_TYPE')
+                {
+                    let typeScores: {[index: string]: any} = {};
+                    let typeCounts: {[index: string]: any} = {};
+
+                    // Loop through assignments
+                    course.assignments.forEach(assignment =>
+                    {
+                        // If assignment should be displayed
+                        if (assignment.complete != 'Complete') return;
+
+                        // Date is being looked at
+                        let assignmentDate = new Date(assignment.date);
+                        if (assignmentDate.getTime() < date.getTime())
+                        {
+                            // Record scores
+                            if (typeScores[assignment.type] == undefined) typeScores[assignment.type] = 0;
+                            typeScores[assignment.type] += assignment.score / assignment.scoreMax;
+
+                            if (typeCounts[assignment.type] == undefined) typeCounts[assignment.type] = 0;
+                            typeCounts[assignment.type] ++;
+                        }
+                    });
+
+                    // Count total percentage (This is to avoid less than expected cases)
+                    // Eg. If HW = 25% and Quiz = 75%, I have 1 hw and 0 quiz
+                    // Without total percentage, the avg grade I get is 25%.
+                    let totalPercentage = 0;
+                    for (let type in course.grading.weightingMap)
+                    {
+                        if (typeScores[type] != undefined)
+                        {
+                            totalPercentage += course.grading.weightingMap[type];
+                        }
+                    }
+
+                    // Count
+                    let score = 0;
+                    for (let type in typeScores)
+                    {
+                        let typeFactor = course.grading.weightingMap[type] / totalPercentage;
+                        score += typeScores[type] * typeFactor / typeCounts[type];
+                    }
+
+                    // Add average to the row
+                    if (score != 0) row[course.name] = score * 100;
+                }
+            });
+
+            // Add it to the array
+            rows.push(row);
+        });
+
+        return {
+            columns: columns,
+            rows: rows
+        }
+    }
+}

src/pages/overall/overall-line/overall-line.vue

@@ -0,0 +1,8 @@
+<template>
+    <div id="overall-line">
+        <ve-line :data="convertChart" :extend="settings"></ve-line>
+    </div>
+</template>
+
+<script src="./overall-line.ts" lang="ts"></script>
+<style src="./overall-line.scss" lang="scss"></style>

src/pages/overall/overall.scss

@@ -0,0 +1,62 @@
+
+// Add some margins
+.el-card
+{
+    margin: 10px;
+    height: 494px;
+    padding: 0;
+
+    // Vertical center
+    display: flex;
+    justify-content: center;
+    flex-direction: column;
+}
+
+.gpa-card
+{
+    margin-left: 20px;
+    min-width: 136px;
+}
+
+.gpa
+{
+    display: block;
+}
+
+.gpa.header
+{
+    font-size: 14px;
+}
+
+.gpa.text
+{
+    font-size: 35px;
+    font-family: 'Avenir', Helvetica, Arial, sans-serif;
+}
+
+.gpa.max
+{
+    margin-top: -10px;
+    margin-bottom: 10px;
+    font-size: 12px;
+    color: #409eff;
+}
+
+.gpa.time
+{
+    font-size: 11px;
+}
+
+// Cards
+.el-card.overall-bar-card
+{
+    margin-right: 20px;
+    min-width: 170px;
+}
+
+// Fix padding
+.el-card__body
+{
+    padding-top: 0 !important;
+    padding-bottom: 0 !important;
+}

src/pages/overall/overall.ts

@@ -1,98 +1,24 @@
 import {Component, Prop, Vue} from 'vue-property-decorator';
-import GraphOverall from '@/pages/overall/graph-overall/graph-overall';
+import OverallLine from '@/pages/overall/overall-line/overall-line';
+import OverallBar from '@/pages/overall/overall-bar/overall-bar';
+import OverallCourse from '@/pages/overall/overall-course/overall-course';
 import {Course} from '@/components/app/app';
+import {GPAUtils} from '@/utils/gpa-utils';
 
 @Component({
-    components: {GraphOverall}
+    components: {OverallLine, OverallBar, OverallCourse}
 })
 export default class Overall extends Vue
 {
-    @Prop({required: true}) courses: any;
+    // @ts-ignore
+    @Prop({required: true}) courses: Course[];
 
-    get convertCharts()
+    /**
+     * This function is called to get gpa since I can't import another
+     * class in the Vue file.
+     */
+    public getGPA()
     {
-        // Null case
-        if (this.courses == null) return [];
-
-        // Compute the column names
-        let columns = ['date'];
-        this.courses.forEach((course: Course) =>
-        {
-            columns.push(course.name);
-        });
-
-        // Find the min date
-        let minDate: Date = new Date();
-        this.courses.forEach((course: Course) =>
-        {
-            let date = new Date(course.assignments[course.assignments.length - 1].date);
-            if (date < minDate) minDate = date;
-        });
-
-        // Find the dates in between
-        let now = new Date();
-        let dates = [];
-        for (let date = minDate; date <= now; date.setDate(date.getDate() + 1))
-        {
-            dates.push(new Date(date));
-        }
-
-        // Initialize course specific variables
-        let courseScores: {[index: string]: any} = {};
-        let courseMaxScores: {[index: string]: any} = {};
-        let courseIndexes: {[index: string]: any} = {};
-        this.courses.forEach((course: Course) =>
-        {
-            courseScores[course.name] = 0;
-            courseMaxScores[course.name] = 0;
-            courseIndexes[course.name] = course.assignments.length - 1;
-        });
-
-        // Compute the rows data
-        let rows: {[index: string]: any}[] = [];
-        dates.forEach(date =>
-        {
-            // Define row object
-            let row: {[index: string]:any} = {'date': date.toLocaleDateString('en-US')};
-
-            // Loop through courses
-            this.courses.forEach((course: Course) =>
-            {
-                // Reversed loop through the assignments
-                for (let r = courseIndexes[course.name]; r >= 0; r--)
-                {
-                    let assignment = course.assignments[r];
-                    let assignmentDate = new Date(assignment.date);
-
-                    // Date is being looked at
-                    if (assignmentDate.getTime() == date.getTime())
-                    {
-                        // Record scores
-                        courseScores[course.name] += assignment.score;
-                        courseMaxScores[course.name] += assignment.scoreMax;
-                    }
-
-                    // Not now
-                    else if (assignmentDate > date)
-                    {
-                        courseIndexes[course.name] = r;
-                        break;
-                    }
-                }
-
-                // Add average to the row
-                row[course.name] = courseScores[course.name] / courseMaxScores[course.name] * 100;
-            });
-
-            // Add it to the array
-            rows.push(row);
-        });
-
-        console.log(rows);
-
-        return {
-            columns: columns,
-            rows: rows
-        }
+        return GPAUtils.getGPA(this.courses);
     }
 }

src/pages/overall/overall.vue

@@ -1,7 +1,31 @@
 <template>
     <div id="overall">
-        <p>这是 Overall</p>
-        <graph-overall :chart="convertCharts"></graph-overall>
+        <el-row>
+            <el-col :span="4">
+                <el-card class="gpa-card">
+                    <div style="padding: 14px;">
+                        <span class="gpa header">GPA:</span>
+                        <span class="gpa text">{{getGPA().gpa}}</span>
+                        <span class="gpa max">(Out of {{getGPA().max}})</span>
+                        <div class="bottom clearfix gpa time">
+                            <time>{{ new Date().toDateString() }}</time>
+                        </div>
+                    </div>
+                </el-card>
+            </el-col>
+            <el-col :span="14">
+                <el-card class="overall-line-card">
+                    <overall-line :courses="courses"></overall-line>
+                </el-card>
+            </el-col>
+            <el-col :span="6">
+                <el-card class="overall-bar-card">
+                    <overall-bar :courses="courses"></overall-bar>
+                </el-card>
+            </el-col>
+        </el-row>
+
+        <overall-course v-for="course in courses" :course="course"></overall-course>
     </div>
 </template>
 

src/utils/course-utils.ts

@@ -0,0 +1,37 @@
+import {Course} from '@/components/app/app';
+
+export class CourseUtils
+{
+    /**
+     * Return a list of courses that are graphed
+     *
+     * @param original Original course list
+     * @return Course[] Filtered course list
+     */
+    public static getGradedCourses(original: Course[]): Course[]
+    {
+        // Define result
+        let result: Course[] = [];
+
+        // Filter through courses
+        original.forEach(course =>
+        {
+            // Skip future or past courses
+            if (course.status != 'active') return;
+
+            // Skip courses without levels
+            if (course.level == 'None') return;
+
+            // Skip courses without assignments
+            if (course.assignments.length == 0) return;
+            
+            // Skip if there are no grading scale
+            // if (course.grading.method == 'NOT_GRADED') return;
+
+            // Add it to the list
+            result.push(course);
+        });
+
+        return result;
+    }
+}

src/utils/deprecated.txt

@@ -0,0 +1,100 @@
+        // Initialize course specific variables
+        let courseScores: {[index: string]: any} = {};
+        let courseMaxScores: {[index: string]: any} = {};
+        let courseIndexes: {[index: string]: any} = {};
+        courses.forEach(course =>
+        {
+            courseScores[course.name] = 0;
+            courseMaxScores[course.name] = 0;
+            courseIndexes[course.name] = course.assignments.length - 1;
+        });
+
+        // Compute the rows data
+        let rows: {[index: string]: any}[] = [];
+        dates.forEach(date =>
+        {
+            // Define row object
+            let row: {[index: string]:any} = {'date': date.toLocaleDateString('en-US')};
+
+            // Loop through courses
+            courses.forEach(course =>
+            {
+                // Reversed loop through the assignments
+                for (let r = courseIndexes[course.name]; r >= 0; r--)
+                {
+                    let assignment = course.assignments[r];
+
+                    // 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())
+                    {
+                        // Detect grading method and record scores
+                        if (course.grading.method == 'TOTAL_MEAN')
+                        {
+                            courseScores[course.name] += assignment.score;
+                            courseMaxScores[course.name] += assignment.scoreMax;
+                        }
+                        else if (course.grading.method == 'PERCENT_TYPE')
+                        {
+                            let scale = course.grading.weightingMap[assignment.type];
+                            courseScores[course.name] += assignment.score * scale;
+                            courseMaxScores[course.name] += assignment.scoreMax * scale;
+                        }
+                    }
+
+                    // Not now
+                    else if (assignmentDate > date)
+                    {
+                        courseIndexes[course.name] = r;
+                        break;
+                    }
+                }
+
+                // Add average to the row
+                row[course.name] = courseScores[course.name] / courseMaxScores[course.name] * 100;
+            });
+
+            // Add it to the array
+            rows.push(row);
+        });
+
+
+                else if (course.grading.method == 'PERCENT_TYPE')
+                {
+                    let typeScores: {[index: string]: any} = {};
+                    let typeCounts: {[index: string]: any} = {};
+
+                    // Loop through assignments
+                    course.assignments.forEach(assignment =>
+                    {
+                        // If assignment should be displayed
+                        if (assignment.complete != 'Complete') return;
+
+                        // Date is being looked at
+                        let assignmentDate = new Date(assignment.date);
+                        if (assignmentDate.getTime() < date.getTime())
+                        {
+                            // Record scores
+                            if (typeScores[assignment.type] == undefined) typeScores[assignment.type] = 0;
+                            typeScores[assignment.type] += assignment.score / assignment.scoreMax;
+
+                            if (typeCounts[assignment.type] == undefined) typeCounts[assignment.type] = 0;
+                            typeCounts[assignment.type] ++;
+                        }
+                    });
+
+                    let score = 0;
+
+                    // Count
+                    for (let type in typeScores)
+                    {
+                        score += typeScores[type] * course.grading.weightingMap[type] / typeCounts[type];
+                        console.log(type);
+                    }
+
+                    // Add average to the row
+                    row[course.name] = score * 100;
+                }

src/utils/gpa-utils.ts

@@ -0,0 +1,130 @@
+/**
+ * This is an utility class to calculate GPA.
+ */
+import {Course} from '@/components/app/app';
+
+export class GPAUtils
+{
+    // [[Min score, Letter grade, Base GPA], ...]
+    public static SCALE =
+    [
+        [96.5, 'A+', 4.00],
+        [92.5, 'A' , 3.75],
+        [89.5, 'A-', 3.50],
+        [86.5, 'B+', 3.25],
+        [82.5, 'B' , 3.00],
+        [79.5, 'B-', 2.75],
+        [76.5, 'C+', 2.50],
+        [72.5, 'C' , 2.25],
+        [70.5, 'C-', 2.00],
+        [69.5, 'D' , 1.00],
+        [0   , 'F' , 0.00]
+    ];
+
+    // Keywords
+    public static MIN = 0;
+    public static LETTER = 1;
+    public static GPA = 2;
+
+    /**
+     * Calculate GPA for a list of couses
+     *
+     * @param coursesOriginal List of courses
+     */
+    public static getGPA(coursesOriginal: Course[]): {gpa: number, accurate: boolean, max: number}
+    {
+        // Clone array
+        let courses: Course[] = [];
+
+        // Accurate or not
+        let accurate: boolean = true;
+
+        // Remove all courses that does not have a grade
+        coursesOriginal.forEach(course =>
+        {
+            if (course.letterGrade == null || course.letterGrade == '')
+            {
+                accurate = false;
+            }
+            else if (course.level != 'none')
+            {
+                courses.push(course);
+            }
+        });
+
+        // If no course have grade, return -1
+        if (courses.length == 0)
+        {
+            return {gpa: -1, accurate: false, max: -1};
+        }
+
+        // Count total GPA
+        let totalGPA = 0;
+        let maxTotal = 0;
+        courses.forEach(course =>
+        {
+            totalGPA += this.getGP(course, course.letterGrade);
+            maxTotal += this.getGP(course, 'A+');
+        });
+
+        // Get average GPA, round to two decimal places
+        let gpa = Math.round(totalGPA / courses.length * 100) / 100;
+        let maxGPA = Math.round(maxTotal / courses.length * 100) / 100;
+
+        // Return results
+        return {gpa: gpa, accurate: accurate, max: maxGPA};
+    }
+
+    /**
+     * Calculate GPA for a course
+     *
+     * @param course Course
+     * @param letterGrade Letter grade
+     */
+    public static getGP(course: Course, letterGrade?: string): number
+    {
+        // Find the GPA for this course.
+        for (let scale of this.SCALE)
+        {
+            // Letter grades are the same
+            if (scale[this.LETTER] == letterGrade)
+            {
+                // Get grade and add it
+                let grade = <number> scale[this.GPA];
+
+                // Add scaleUp if not failed.
+                if (grade != 0) grade += course.scaleUp;
+
+                // That's it
+                return grade;
+            }
+        }
+
+        return -1;
+    }
+
+    /**
+     * Calculate the total-mean (total/max) average
+     *
+     * @param course Course
+     */
+    public static getTotalMeanAverage(course: Course)
+    {
+        let score = 0;
+        let max = 0;
+
+        // Loop through assignments
+        course.assignments.forEach(assignment =>
+        {
+            // If assignment should be displayed
+            if (assignment.complete != 'Complete') return;
+
+            // Record scores
+            score += assignment.score;
+            max += assignment.scoreMax;
+        });
+
+        // Return
+        return score / max * 100;
+    }
+}

src/utils/http-utils.ts

@@ -0,0 +1,35 @@
+import Constants from '@/constants';
+
+export class HttpUtils
+{
+    public token: string = '';
+
+    constructor (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: JSON.stringify(body)}).then(res =>
+            {
+                // Get response body text
+                res.text().then(text =>
+                {
+                    // Parse response
+                    let response = JSON.parse(text);
+                    resolve(response);
+                })
+                .catch(reject)
+            })
+            .catch(reject)
+        });
+    }
+}

src/utils/json-utils.ts

@@ -1,4 +1,4 @@
-import {Grade} from '@/components/app/app';
+import {Assignment} from '@/components/app/app';
 
 export default class JsonUtils
 {
@@ -6,23 +6,26 @@ export default class JsonUtils
      * This method filters the information provided in an assignments json.
      *
      * @param assignments Assignments object
-     * @returns Grade[] Filtered assignment grade object list
+     * @returns Assignment[] Filtered assignment grade object list
      */
-    public static filterAssignments(assignments: any): Grade[]
+    public static filterAssignments(assignments: any): Assignment[]
     {
-        let result: Grade[] = [];
+        let result: Assignment[] = [];
 
         assignments.assignments.forEach((assignment: any) =>
         {
             result.push(
             {
+                id: assignment.assignment_id,
                 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,
 
+                unread: assignment.is_unread == 1,
+
                 scoreMax: assignment.maximum_score,
                 score: +assignment.raw_score
             });

vue.config.js

@@ -0,0 +1,7 @@
+module.exports =
+{
+    devServer:
+    {
+        disableHostCheck: true,
+    }
+};