From ef2afa13e88626b87518f0038e88063c7a360483 Mon Sep 17 00:00:00 2001
From: Yaman Qalieh <ybq987@gmail.com>
Date: Mon, 29 Aug 2016 20:39:36 -0400
Subject: [PATCH] make themeColors global

---
 hourglass/client/main/main.js | 44 +++++++----------------------------
 1 file changed, 8 insertions(+), 36 deletions(-)

diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js
index 55c49ea..83bbd01 100644
--- a/hourglass/client/main/main.js
+++ b/hourglass/client/main/main.js
@@ -11,34 +11,6 @@ var openValues = {
     "options": "-20%"
 };
 
-Session.set('themeColors', {
-    "light": {
-        "background": "White.jpg",
-        "header": "#EBEBEB",
-        "sidebar": "#65839A",
-        "funcButton": "#849CAE",
-        "statusIcons": "#33ADFF",
-        "highlightText": "#FF1A1A",
-        "cards": "#FEFEFE",
-        "classes":"#EBEBEB",
-        "calendar": "#000",
-        "text": "#000"
-    },
-    "dark": {
-        "background": "Black.jpg",
-        "header": "#373A56",
-        "sidebar": "#35435D",
-        "funcButton": "#5d75A2",
-        "statusIcons": "#33ADFF",
-        "highlightText": "#FF1A1A",
-        "cards": "#151A2B",
-        "classes":"#46396E",
-        "calendar": "#000",
-        //30313B
-        "text": "#F6F6F6" 
-    }
-});
-
 var workColors = {
     "normal": "#2E4F74",
     "quiz": "#409333",
@@ -80,11 +52,11 @@ Session.set("classDispHover",null);
 Session.set("commentRestrict",null);
 
 Template.registerHelper('divColor', (div) => { // Reactive color changing based on preferences. Colors stored in Session.get("themeColors").
-    return Session.get("themeColors")[Meteor.user().profile.preferences.theme][div];
+    return themeColors[Meteor.user().profile.preferences.theme][div];
 });
 
 Template.registerHelper('textColor', () => { // Reactive color for text. 
-    document.getElementsByTagName("body")[0].style.color = Session.get("themeColors")[Meteor.user().profile.preferences.theme].text;
+    document.getElementsByTagName("body")[0].style.color = themeColors[Meteor.user().profile.preferences.theme].text;
     return;
 });
 
@@ -93,7 +65,7 @@ Template.registerHelper('overlayDim', (part) => { // Gets size of the overlay co
     var width = "width:" + dim[0].toString() + "px;";
     var height = "height:" + dim[1].toString() + "px;";
     var margin = "margin-left:" + (-dim[0] / 2).toString() + "px;";
-    var bg = "background-color:" + Session.get("themeColors")[Meteor.user().profile.preferences.theme].header + ";";
+    var bg = "background-color:" + themeColors[Meteor.user().profile.preferences.theme].header + ";";
     return width + height + margin + bg;
 });
 
@@ -198,9 +170,9 @@ Template.main.helpers({
     },
     iconColor(icon) {
         if (Session.get("sidebar") === icon + "Container") {
-            return Session.get("themeColors")[Meteor.user().profile.preferences.theme].statusIcons;
+            return themeColors[Meteor.user().profile.preferences.theme].statusIcons;
         } else if (Session.get("sidebar") === "both") {
-            return Session.get("themeColors")[Meteor.user().profile.preferences.theme].statusIcons;
+            return themeColors[Meteor.user().profile.preferences.theme].statusIcons;
         } else {
             return;
         }
@@ -214,7 +186,7 @@ Template.main.helpers({
     },
     bgSrc() {
         var dim = [window.innerWidth, window.innerHeight];
-        var pic = "Backgrounds/"+Session.get("themeColors")[Meteor.user().profile.preferences.theme].background;
+        var pic = "Backgrounds/"+themeColors[Meteor.user().profile.preferences.theme].background;
         return pic;
     },
     menuStatus() {
@@ -237,7 +209,7 @@ Template.main.helpers({
     },
     modeStatus(status) {
         if (status === Session.get("mode")) {
-            return Session.get("themeColors")[Meteor.user().profile.preferences.theme].highlightText;
+            return themeColors[Meteor.user().profile.preferences.theme].highlightText;
         } else {
             return;
         }
@@ -333,7 +305,7 @@ Template.main.helpers({
         return "width:" + width.toString() + "px;margin-left:" + (0.5 * window.innerWidth - 0.5 * width).toString() + "px;";
     },
     calColor() {
-        return "color:"+Session.get("themeColors")[Meteor.user().profile.preferences.theme].calendar;
+        return "color:"+themeColors[Meteor.user().profile.preferences.theme].calendar;
     },
     calbg() {
         var width = window.innerWidth * 0.865;