From 043a453b2d2bb8e79d90d8d4049c07d6b490e45d Mon Sep 17 00:00:00 2001
From: Kenneth Jao <ksjdragon@gmail.com>
Date: Wed, 2 Nov 2016 19:18:36 -0400
Subject: [PATCH] Minor changes, small fixes

---
 hourglass/client/main/main.html |  2 +-
 hourglass/client/main/main.js   | 43 ++++++++++++---------------------
 2 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/hourglass/client/main/main.html b/hourglass/client/main/main.html
index e445b60..e3eb7ca 100644
--- a/hourglass/client/main/main.html
+++ b/hourglass/client/main/main.html
@@ -31,7 +31,7 @@
             </div>
         </div>
         <div id="divCenter">
-            <header id="mainHeader" style="background-color:{{divColor 'mainColor'}}{{textColor}}{{defaultMode}}{{refetchEvents}}">
+            <header id="mainHeader" style="background-color:{{divColor 'mainColor'}}{{refetchEvents}}">
                 <h1>Hourglass</h1><h2>{{schoolName}}</h2>
                 <div id="dropdown">
                     <img src="{{avatar}}">
diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js
index 54c4f2b..53f9a4e 100644
--- a/hourglass/client/main/main.js
+++ b/hourglass/client/main/main.js
@@ -39,6 +39,10 @@ Template.login.rendered = function() {
     Accounts._loginButtonsSession.set('dropdownVisible', true);
 };
 
+Template.main.created = function() {
+    Session.set("mode", Session.get("user").preferences.mode); 
+}
+
 Template.main.rendered = function() {
     Accounts._loginButtonsSession.set('dropdownVisible', true);
     setTimeout(startDragula, 300);
@@ -50,10 +54,12 @@ Template.main.rendered = function() {
         railColor: '#222',
         railOpacity: 0.1,
     });*/
+    document.getElementsByTagName("body")[0].style.color = Session.get("user").preferences.theme.textColor;
 };
 
 Template.profile.rendered = function() {
     Accounts._loginButtonsSession.set('dropdownVisible', true);
+    document.getElementsByTagName("body")[0].style.color = Session.get("user").preferences.theme.textColor;
 };
 
 Template.selectOptionMenu.rendered = function() {
@@ -83,11 +89,6 @@ Template.registerHelper('divColor', (div) => { // Reactive color changing based
     return Session.get("user").preferences.theme[div];
 });
 
-Template.registerHelper('textColor', () => { // Reactive color for text.
-    document.getElementsByTagName("body")[0].style.color = Session.get("user").preferences.theme.textColor;
-    return;
-});
-
 Template.registerHelper('overlayDim', (part) => { // Gets size of the overlay container.
     var dim = [window.innerWidth * 0.25, window.innerHeight * 0.2];
     var width = "width:" + dim[0].toString() + "px;";
@@ -287,11 +288,6 @@ Template.main.helpers({
     username() { // Returns user name.
         return Session.get("user").name;
     },
-    defaultMode() { //Loads the default display mode for user.
-        if (load) 
-        load = false;
-        return;
-    },
     bgSrc() { // Returns background.
         return "Backgrounds/" + Session.get("user").preferences.theme.background;
     },
@@ -491,28 +487,14 @@ Template.main.events({
     },
     'click .classes' () { // Click classes mode button.
         if (Session.equals("mode", "classes")) return;
-        var modeHolder = document.getElementById("mainBody");
-        closeDivFade(modeHolder);
-        setTimeout(function() {
-            Session.set("mode", "classes");
-            openDivFade(modeHolder);
-        }, 300);
+        toggleToMode("classes")
         setTimeout(startDragula, 500);
-        Session.set("sidebarMode", Session.get("sidebarMode")[0], false); // Closes all sidebars.
         toggleToSidebar(false);
-        Session.set("sidebarMode", [null,null]);
     },
     'click .calendar' () { // Click calendar mode button.
-        if (Session.equals("mode", "calendar")) return;
-        var modeHolder = document.getElementById("mainBody");
-        closeDivFade(modeHolder);
-        setTimeout(function() {
-            Session.set("mode", "calendar");
-            openDivFade(modeHolder);
-        }, 300);
-        Session.set("sidebarMode", Session.get("sidebarMode")[0], false); // Closes all sidebars.
+         if (Session.equals("mode", "calendar")) return;
+        toggleToMode("calendar");
         toggleToSidebar(false);
-        Session.set("sidebarMode", [null,null]);
     },
     'click .creWork' (event) { // Cick add work button.
         var attr;
@@ -873,6 +855,13 @@ function toggleOptionMenu(toggle, menu) {
     }
 }
 
+function toggleToMode(mode) {
+    $("#mainBody").fadeOut(250, function() {
+        Session.set("mode",mode);
+        $("#mainBody").fadeIn(250);
+    });
+}
+
 function openDivFade(div) {
     div.style.display = "block";
     div.style.opacity = "0";