kjao/archive
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ksjdragon/hourglass

Browse Source
This commit is contained in:
Yaman Qalieh 2016-09-27 19:12:26 -04:00
commit 36705152e0
7 changed files with 147 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hourglass/client/main/main.css
View File

@ -262,7 +262,7 @@ input, textarea {
.mode, .function { .mode, .function {
width: 100%; width: 100%;
position: relative; position: relative;
background-color: #849CAE; background-color: rgba(255,255,255,0.2);
-webkit-transition: background-color 0.5s ease, box-shadow 0.5s ease; -webkit-transition: background-color 0.5s ease, box-shadow 0.5s ease;
-moz-transition: background-color 0.5s ease, box-shadow 0.5s ease; -moz-transition: background-color 0.5s ease, box-shadow 0.5s ease;
@ -577,6 +577,7 @@ input, textarea {
} }
#editWork { #editWork {
min-height: 68vh;
margin: auto; margin: auto;
margin-top: 5%; margin-top: 5%;
@ -599,6 +600,7 @@ input, textarea {
#editWorkCont { #editWorkCont {
width: 100%; width: 100%;
height: 100%; height: 100%;
min-height: 68vh;
position: relative; position: relative;
display: table; display: table;
@ -1012,9 +1014,12 @@ input, textarea {
background-color: rgba(255,255,255,0.1); background-color: rgba(255,255,255,0.1);
} }
.fc-past {
background-color: rgba(0,0,0,0.2);
}
.fc-day:not(.fc-past) { .fc-day:not(.fc-past) {
cursor: pointer; cursor: pointer;
box-shadow: inset 0 0 0 99999px rgba(0,0,0,0.1);
-webkit-transition: box-shadow 0.4s ease; -webkit-transition: box-shadow 0.4s ease;
-moz-transition: box-shadow 0.4s ease; -moz-transition: box-shadow 0.4s ease;
@ -1023,7 +1028,7 @@ input, textarea {
} }
.fc-day:not(.fc-past):hover { .fc-day:not(.fc-past):hover {
box-shadow: inset 0 0 0 99999px rgba(0,0,0,0.15); box-shadow: inset 0 0 0 99999px rgba(0,0,0,0.1);
} }
.fc-slats, .fc-content-skeleton { .fc-slats, .fc-content-skeleton {

71
hourglass/client/main/main.html
View File

@ -5,28 +5,28 @@
<template name="main"> <template name="main">
<div class="noScroll"> <div class="noScroll">
<header id="mainHeader" style="background-color:{{userProfile}}{{divColor 'header'}}{{textColor}}{{defaultMode}}{{refetchEvents}}"> <header id="mainHeader" style="background-color:{{userProfile}}{{divColor 'mainColor'}}{{textColor}}{{defaultMode}}{{refetchEvents}}">
<i class="fa fa-bars" aria-hidden="true" style="color:{{iconColor 'menu'}}"></i> <i class="fa fa-bars" aria-hidden="true" style="color:{{iconColor 'menu'}}"></i>
<h1>Hourglass</h1><h2>{{schoolName}}</h2> <h1>Hourglass</h1><h2>{{schoolName}}</h2>
<i class="fa fa-cog" aria-hidden="true" style="color:{{iconColor 'options'}}"></i> <i class="fa fa-cog" aria-hidden="true" style="color:{{iconColor 'options'}}"></i>
<div id="dropdown"> <div id="dropdown">
<img src="{{avatar}}"> <img src="{{avatar}}">
</div> </div>
<div id="headerBar"></div> <div id="headerBar" style="background-color:{{divColor 'iconHighlight'}}"></div>
</header> </header>
<div id="menuContainer" style="left:{{menuStatus}};background-color:{{divColor 'sidebar'}}"> <div id="menuContainer" style="left:{{menuStatus}};background-color:{{divColor 'sidebarColor'}}">
<div id="modes"> <div id="modes">
<div class="mode classes" style="background-color:{{divColor 'funcButton'}}"> <div class="mode classes">
<i class="fa fa-university" aria-hidden="true"></i> <i class="fa fa-university" aria-hidden="true"></i>
<h4 style="color:{{modeStatus 'classes'}}">Classes</h4> <h4 style="color:{{modeStatus 'classes'}}">Classes</h4>
</div> </div>
<div class="mode calendar" style="background-color:{{divColor 'funcButton'}}"> <div class="mode calendar">
<i class="fa fa-calendar" aria-hidden="true"></i> <i class="fa fa-calendar" aria-hidden="true"></i>
<h4 style="color:{{modeStatus 'calendar'}}">Calendar</h4> <h4 style="color:{{modeStatus 'calendar'}}">Calendar</h4>
</div> </div>
</div> </div>
<div id="functions"> <div id="functions">
<div class="function manageClass" onclick="window.location='/profile'" style="background-color:{{divColor 'funcButton'}}"> <div class="function manageClass" onclick="window.location='/profile'">
<i class="fa fa-tasks" aria-hidden="true"></i> <i class="fa fa-tasks" aria-hidden="true"></i>
<h4>Manage Classes</h4> <h4>Manage Classes</h4>
</div> </div>
@ -54,13 +54,12 @@
</div> </div>
</div> </div>
{{/if}} {{/if}}
<div id="exportDiv" class="sideFilter"> <div id="exportDiv" class="sideFilter">
<i id="export" class="fa fa-download" aria-hidden="true"></i> <i id="export" class="fa fa-download" aria-hidden="true"></i>
<h4 id="exportText">Export</h4> <h4 id="exportText">Export</h4>
</div> </div>
</div> </div>
<div id="optionsContainer" style="right:{{optionsStatus}};background-color:{{divColor 'sidebar'}}"> <div id="optionsContainer" style="right:{{optionsStatus}};background-color:{{divColor 'sidebarColor'}}">
<h3>Preferences</h3> <h3>Preferences</h3>
<div id="prefCont"> <div id="prefCont">
@ -70,8 +69,8 @@
<span class="change radio" re="readonly" id="prefTheme">{{pref 'theme'}}</span> <span class="change radio" re="readonly" id="prefTheme">{{pref 'theme'}}</span>
</div> </div>
<div class="prefOptions"> <div class="prefOptions">
<p class="prefOptionText" style="background-color:{{divColor 'header'}}">Light</p> <p class="prefOptionText" style="background-color:{{divColor 'mainColor'}}">Light</p>
<p class="prefOptionText" style="background-color:{{divColor 'header'}}">Dark</p> <p class="prefOptionText" style="background-color:{{divColor 'mainColor'}}">Dark</p>
</div> </div>
</div> </div>
<div> <div>
@ -80,8 +79,8 @@
<span class="change radio" re="readonly" id="prefMode">{{pref 'mode'}}</span> <span class="change radio" re="readonly" id="prefMode">{{pref 'mode'}}</span>
</div> </div>
<div class="prefOptions"> <div class="prefOptions">
<p class="prefOptionText" style="background-color:{{divColor 'header'}}">Classes</p> <p class="prefOptionText" style="background-color:{{divColor 'mainColor'}}">Classes</p>
<p class="prefOptionText" style="background-color:{{divColor 'header'}}">Calendar</p> <p class="prefOptionText" style="background-color:{{divColor 'mainColor'}}">Calendar</p>
</div> </div>
</div> </div>
<div> <div>
@ -90,11 +89,11 @@
<span class="change radio" re="readonly" id="prefHide">{{pref 'timeHide'}}</span> <span class="change radio" re="readonly" id="prefHide">{{pref 'timeHide'}}</span>
</div> </div>
<div class="prefOptions"> <div class="prefOptions">
<p class="prefOptionText" style="background-color:{{divColor 'header'}}">1 Day</p> <p class="prefOptionText" style="background-color:{{divColor 'mainColor'}}">1 Day</p>
<P class="prefOptionText" style="background-color:{{divColor 'header'}}">2 Days</p> <P class="prefOptionText" style="background-color:{{divColor 'mainColor'}}">2 Days</p>
<p class="prefOptionText" style="background-color:{{divColor 'header'}}">1 Week</p> <p class="prefOptionText" style="background-color:{{divColor 'mainColor'}}">1 Week</p>
<p class="prefOptionText" style="background-color:{{divColor 'header'}}">1 Month</p> <p class="prefOptionText" style="background-color:{{divColor 'mainColor'}}">1 Month</p>
<p class="prefOptionText" style="background-color:{{divColor 'header'}}">Never</p> <p class="prefOptionText" style="background-color:{{divColor 'mainColor'}}">Never</p>
</div> </div>
</div> </div>
<div> <div>
@ -103,8 +102,8 @@
<span class="change radio" re="readonly" id="prefDone">{{pref 'done'}}</span> <span class="change radio" re="readonly" id="prefDone">{{pref 'done'}}</span>
</div> </div>
<div class="prefOptions"> <div class="prefOptions">
<p class="prefOptionText" style="background-color:{{divColor 'header'}}">Yes</p> <p class="prefOptionText" style="background-color:{{divColor 'mainColor'}}">Yes</p>
<p class="prefOptionText" style="background-color:{{divColor 'header'}}">No</p> <p class="prefOptionText" style="background-color:{{divColor 'mainColor'}}">No</p>
</div> </div>
</div> </div>
<div> <div>
@ -113,8 +112,8 @@
<span class="change radio" re="readonly" id="prefReport">{{pref 'hideReport'}}</span> <span class="change radio" re="readonly" id="prefReport">{{pref 'hideReport'}}</span>
</div> </div>
<div class="prefOptions"> <div class="prefOptions">
<p class="prefOptionText" style="background-color:{{divColor 'header'}}">Yes</p> <p class="prefOptionText" style="background-color:{{divColor 'mainColor'}}">Yes</p>
<p class="prefOptionText" style="background-color:{{divColor 'header'}}">No</p> <p class="prefOptionText" style="background-color:{{divColor 'mainColor'}}">No</p>
</div> </div>
</div> </div>
</div> </div>
@ -138,7 +137,7 @@
<div class="overlay"> <div class="overlay">
<div id="editWork" style="width:{{screen '.4'}}"> <div id="editWork" style="width:{{screen '.4'}}">
<div id="editWorkCont" style="background-color:{{divColor 'header'}};border-top:10px solid {{work 'typeColor'}}"> <div id="editWorkCont" style="background-color:{{divColor 'mainColor'}};border-top:10px solid {{work 'typeColor'}}">
<div id="workInfoContainer"> <div id="workInfoContainer">
<div id="workNameDiv"> <div id="workNameDiv">
<span id="workNamerestrict">{{commentLength}}</span> <span id="workNamerestrict">{{commentLength}}</span>
@ -160,11 +159,11 @@
<span class="change radio req" re="readonly" id="workType">{{work 'type'}}</span> <span class="change radio req" re="readonly" id="workType">{{work 'type'}}</span>
</div> </div>
<div class="workOptions type"> <div class="workOptions type">
<p class="workOptionText" style="background-color:{{divColor 'header'}}">Normal</p> <p class="workOptionText" style="background-color:{{divColor 'mainColor'}}">Normal</p>
<p class="workOptionText" style="background-color:{{divColor 'header'}}">Quiz</p> <p class="workOptionText" style="background-color:{{divColor 'mainColor'}}">Quiz</p>
<p class="workOptionText" style="background-color:{{divColor 'header'}}">Test</p> <p class="workOptionText" style="background-color:{{divColor 'mainColor'}}">Test</p>
<p class="workOptionText" style="background-color:{{divColor 'header'}}">Project</p> <p class="workOptionText" style="background-color:{{divColor 'mainColor'}}">Project</p>
<p class="workOptionText" style="background-color:{{divColor 'header'}}">Other</p> <p class="workOptionText" style="background-color:{{divColor 'mainColor'}}">Other</p>
</div> </div>
</div> </div>
<!-- <div id="workAttach">Attach other files</div> <!-- <div id="workAttach">Attach other files</div>
@ -234,13 +233,13 @@
</div> </div>
</div> </div>
<div id="userDropdown" style="background-color:{{divColor 'dropdown'}}"> <div id="userDropdown" style="background-color:{{divColor 'userDropdownColor'}}">
<div id="userTab" style="border-bottom: 3vh solid {{divColor 'dropdown'}}"></div> <div id="userTab" style="border-bottom: 3vh solid {{divColor 'userDropdownColor'}}"></div>
<div id="userDropdownAvatar" style="background-color:{{divColor 'dropdown'}}"> <div id="userDropdownAvatar" style="background-color:{{divColor 'userDropdownColor'}}">
<img src="{{avatar}}"> <img src="{{avatar}}">
<p>{{username}}</p> <p>{{username}}</p>
</div> </div>
<div id="userFunctions" style="background-color:{{divColor 'dropdown'}}"> <div id="userFunctions" style="background-color:{{divColor 'userDropdownColor'}}">
<div id="myprofile" class="userFunction" onclick="window.location='/profile';"> <div id="myprofile" class="userFunction" onclick="window.location='/profile';">
<i class="fa fa-user" aria-hidden="true"></i> <i class="fa fa-user" aria-hidden="true"></i>
<p>My Profile</p> <p>My Profile</p>
@ -252,7 +251,7 @@
</div> </div>
{{/if}} {{/if}}
</div> </div>
<div style="background-color:{{divColor 'dropdown'}}"> <div style="background-color:{{divColor 'userDropdownColor'}}">
<div id="myprofile" class="userFunction" onclick="document.getElementById('login-buttons-logout').click();"> <div id="myprofile" class="userFunction" onclick="document.getElementById('login-buttons-logout').click();">
<i class="fa fa-sign-out" aria-hidden="true"></i> <i class="fa fa-sign-out" aria-hidden="true"></i>
<p>Sign out</p> <p>Sign out</p>
@ -260,13 +259,13 @@
</div> </div>
</div> </div>
<div id="requests" style="bottom:{{requestStatus}};background-color:{{divColor 'cards'}}"> <div id="requests" style="bottom:{{requestStatus}};background-color:{{divColor 'secondaryColor'}}">
<div id="requestTab" style="background-color:{{divColor 'cards'}}"> <div id="requestTab" style="background-color:{{divColor 'secondaryColor'}}">
<i class="fa fa-question" aria-hidden="true"></i> <i class="fa fa-question" aria-hidden="true"></i>
</div> </div>
<p>Send an help request, feature, or bug report.</p> <p>Send an help request, feature, or bug report.</p>
<textarea id="requestArea" class="restrict" rows="4" cols="50" maxlength="500" placeholder="Enter request here..."></textarea><br> <textarea id="requestArea" class="restrict" rows="4" cols="50" maxlength="500" placeholder="Enter request here..."></textarea><br>
<div id="requestCont" style="background-color:{{divColor 'cards'}}"> <div id="requestCont" style="background-color:{{divColor 'secondaryColor'}}">
<span id="requestrestrict">{{commentLength}}</span> <span id="requestrestrict">{{commentLength}}</span>
<div id="requestSubmit">Send</div> <div id="requestSubmit">Send</div>
</div> </div>
@ -291,7 +290,7 @@
<template name="classesMode"> <template name="classesMode">
<div class="classWrapper"> <div class="classWrapper">
<div class="mainClass" style="background-color:{{divColor 'classes'}}"> <div class="mainClass" style="background-color:{{divColor 'classCardColor'}}">
<div class="classInfo"> <!-- class color --> <div class="classInfo"> <!-- class color -->
<h3 class="mainClassName">{{name}}</h3> <h3 class="mainClassName">{{name}}</h3>
<p class="mainClassHour">{{hour}}</p> <p class="mainClassHour">{{hour}}</p>

8
hourglass/client/main/main.js
View File

@ -92,7 +92,7 @@ Template.registerHelper('divColor', (div) => { // Reactive color changing based
}); });
Template.registerHelper('textColor', () => { // Reactive color for text. Template.registerHelper('textColor', () => { // Reactive color for text.
document.getElementsByTagName("body")[0].style.color = themeColors[Session.get("user").preferences.theme].text; document.getElementsByTagName("body")[0].style.color = themeColors[Session.get("user").preferences.theme].textColor;
return; return;
}); });
@ -260,7 +260,7 @@ function startDragula() {
Template.main.helpers({ Template.main.helpers({
schoolName() { // Finds the name of the user's school. schoolName() { // Finds the name of the user's school.
if(Session.get("user").school === undefined) return; if(Session.get("user").school === undefined || Session.get("user").school === null) return;
return " - " + Session.get("user").school; return " - " + Session.get("user").school;
}, },
iconColor(icon) { // Sidebar status color iconColor(icon) { // Sidebar status color
@ -310,7 +310,7 @@ Template.main.helpers({
}, },
modeStatus(status) { // Color status of display modes. modeStatus(status) { // Color status of display modes.
if (!Session.equals("mode",status)) return; if (!Session.equals("mode",status)) return;
return themeColors[Session.get("user").preferences.theme].highlightText; return themeColors[Session.get("user").preferences.theme].modeHighlight;
}, },
currMode(name) { // Status of display mode. currMode(name) { // Status of display mode.
return Session.equals("mode",name); return Session.equals("mode",name);
@ -975,7 +975,7 @@ function closeInput(modifyingInput) { // Close a changeable input and change it
if (Session.equals("sidebar", "optionsContainer") || Session.equals("sidebar", "both")) { if (Session.equals("sidebar", "optionsContainer") || Session.equals("sidebar", "both")) {
color = "#000"; color = "#000";
} else { } else {
color = "#8C8C8C"; color = "#BEBEBE";
} }
span.style.color = color; span.style.color = color;
Session.set("commentRestrict",""); Session.set("commentRestrict","");

4
hourglass/client/profile/profile.css
View File

@ -1,6 +1,6 @@
.change { .change {
font-size: 150%; font-size: 150%;
color: #8C8C8C; color: #BEBEBE;
cursor: pointer; cursor: pointer;
} }
@ -22,7 +22,7 @@
.changeInput { .changeInput {
font-size: 100%; font-size: 100%;
padding: 0; padding: 0;
color: #8C8C8C; color: #BEBEBE;
position: relative; position: relative;
} }

58
hourglass/client/profile/profile.html
View File

@ -3,7 +3,7 @@
<div id="mainpage{{userProfile}}" onclick="window.location='/'"><h2>Main Page</h2></div> <div id="mainpage{{userProfile}}" onclick="window.location='/'"><h2>Main Page</h2></div>
<div id="logout2" onclick='document.getElementById("login-buttons-logout").click();'><h2>Logout</h2></div> <div id="logout2" onclick='document.getElementById("login-buttons-logout").click();'><h2>Logout</h2></div>
<div id="profWrapper"> <div id="profWrapper">
<div id="profPage" style="background-color:{{divColor 'header'}};min-width:{{screen}}{{textColor}}{{loadNew}}"> <div id="profPage" style="background-color:{{divColor 'mainColor'}};min-width:{{screen}}{{textColor}}{{loadNew}}">
<div id="profMainContainer"> <div id="profMainContainer">
<div id="profTop"> <div id="profTop">
<img id="profBanner" src='{{banner}}' alt="Banner"> <img id="profBanner" src='{{banner}}' alt="Banner">
@ -17,7 +17,7 @@
<div id="profCards"> <div id="profCards">
<div id="cardColLeft"> <div id="cardColLeft">
<!-- Card 1 --> <!-- Card 1 -->
<div id="profInfo" class="card" style="background-color:{{divColor 'cards'}}"> <div id="profInfo" class="card" style="background-color:{{divColor 'secondaryColor'}}">
<h3 class="profHea">About</h3> <h3 class="profHea">About</h3>
<div id="about"> <div id="about">
<div> <div>
@ -31,16 +31,16 @@
<span class="change radio" re="readonly" id="grade">{{grade}}</span> <span class="change radio" re="readonly" id="grade">{{grade}}</span>
</div> </div>
<div class="profOptions"> <div class="profOptions">
<p class="profOptionText" style="background-color:{{divColor 'header'}}">9th</p> <p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">9th</p>
<p class="profOptionText" style="background-color:{{divColor 'header'}}">10th</p> <p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">10th</p>
<p class="profOptionText" style="background-color:{{divColor 'header'}}">11th</p> <p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">11th</p>
<p class="profOptionText" style="background-color:{{divColor 'header'}}">12th</p> <p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">12th</p>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!-- Card 2 --> <!-- Card 2 -->
<div id="profPreferences" class="card" style="background-color:{{divColor 'cards'}}"> <div id="profPreferences" class="card" style="background-color:{{divColor 'secondaryColor'}}">
<h3 class="profHea">Preferences</h3> <h3 class="profHea">Preferences</h3>
<div id="preferences"> <div id="preferences">
<div class="radioContainer"> <div class="radioContainer">
@ -49,8 +49,8 @@
<span class="change radio" re="readonly" id="prefTheme">{{pref 'theme'}}</span> <span class="change radio" re="readonly" id="prefTheme">{{pref 'theme'}}</span>
</div> </div>
<div class="profOptions"> <div class="profOptions">
<p class="profOptionText" style="background-color:{{divColor 'header'}}">Light</p> <p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">Light</p>
<p class="profOptionText" style="background-color:{{divColor 'header'}}">Dark</p> <p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">Dark</p>
</div> </div>
</div> </div>
<br> <br>
@ -60,8 +60,8 @@
<span class="change radio" re="readonly" id="prefMode">{{pref 'mode'}}</span> <span class="change radio" re="readonly" id="prefMode">{{pref 'mode'}}</span>
</div> </div>
<div class="profOptions"> <div class="profOptions">
<p class="profOptionText" style="background-color:{{divColor 'header'}}">Classes</p> <p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">Classes</p>
<p class="profOptionText" style="background-color:{{divColor 'header'}}">Calendar</p> <p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">Calendar</p>
</div> </div>
</div> </div>
<br> <br>
@ -71,11 +71,11 @@
<span class="change radio" re="readonly" id="prefHide">{{pref 'timeHide'}}</span> <span class="change radio" re="readonly" id="prefHide">{{pref 'timeHide'}}</span>
</div> </div>
<div class="profOptions"> <div class="profOptions">
<p class="profOptionText" style="background-color:{{divColor 'header'}}">1 Day</p> <p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">1 Day</p>
<P class="profOptionText" style="background-color:{{divColor 'header'}}">2 Days</p> <P class="profOptionText" style="background-color:{{divColor 'mainColor'}}">2 Days</p>
<p class="profOptionText" style="background-color:{{divColor 'header'}}">1 Week</p> <p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">1 Week</p>
<p class="profOptionText" style="background-color:{{divColor 'header'}}">1 Month</p> <p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">1 Month</p>
<p class="profOptionText" style="background-color:{{divColor 'header'}}">Never</p> <p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">Never</p>
</div> </div>
</div> </div>
<br> <br>
@ -85,8 +85,8 @@
<span class="change radio" re="readonly" id="prefDone">{{pref 'done'}}</span> <span class="change radio" re="readonly" id="prefDone">{{pref 'done'}}</span>
</div> </div>
<div class="profOptions"> <div class="profOptions">
<p class="profOptionText" style="background-color:{{divColor 'header'}}">Yes</p> <p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">Yes</p>
<p class="profOptionText" style="background-color:{{divColor 'header'}}">No</p> <p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">No</p>
</div> </div>
</div> </div>
<br> <br>
@ -96,8 +96,8 @@
<span class="change radio" re="readonly" id="prefReport">{{pref 'hideReport'}}</span> <span class="change radio" re="readonly" id="prefReport">{{pref 'hideReport'}}</span>
</div> </div>
<div class="profOptions"> <div class="profOptions">
<p class="profOptionText" style="background-color:{{divColor 'header'}}">Yes</p> <p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">Yes</p>
<p class="profOptionText" style="background-color:{{divColor 'header'}}">No</p> <p class="profOptionText" style="background-color:{{divColor 'mainColor'}}">No</p>
</div> </div>
</div> </div>
</div> </div>
@ -105,7 +105,7 @@
</div> </div>
<div id="cardColRight"> <div id="cardColRight">
<!-- Card 3 --> <!-- Card 3 -->
<div id="profClasses" class="card" style="background-color:{{divColor 'cards'}};"> <div id="profClasses" class="card" style="background-color:{{divColor 'secondaryColor'}};">
<h3 class="profHea">Classes</h3> <h3 class="profHea">Classes</h3>
<div id="classes"> <div id="classes">
<div id="profFunctions"> <div id="profFunctions">
@ -207,17 +207,17 @@ $(document).ready(function() {
</select> </select>
<input class="creInput radio op" type="text" name="privacy" readonly> <input class="creInput radio op" type="text" name="privacy" readonly>
<div class="profOptions creOp"> <div class="profOptions creOp">
<p class="profOptionText cre" style="background-color:{{divColor 'header'}}">Public</p> <p class="profOptionText cre" style="background-color:{{divColor 'mainColor'}}">Public</p>
<p class="profOptionText cre" style="background-color:{{divColor 'header'}}">Private</p> <p class="profOptionText cre" style="background-color:{{divColor 'mainColor'}}">Private</p>
</div> </div>
</div> </div>
<div class="formDiv"> <div class="formDiv">
<p class="profTitle">Category:</p> <p class="profTitle">Category:</p>
<input class="creInput radio op" type="text" name="category" readonly> <input class="creInput radio op" type="text" name="category" readonly>
<div class="profOptions creOp"> <div class="profOptions creOp">
<p class="profOptionText cre" style="background-color:{{divColor 'header'}}">Class</p> <p class="profOptionText cre" style="background-color:{{divColor 'mainColor'}}">Class</p>
<p class="profOptionText cre" style="background-color:{{divColor 'header'}}">Club</p> <p class="profOptionText cre" style="background-color:{{divColor 'mainColor'}}">Club</p>
<p class="profOptionText cre" style="background-color:{{divColor 'header'}}">Other</p> <p class="profOptionText cre" style="background-color:{{divColor 'mainColor'}}">Other</p>
</div> </div>
</div> </div>
</div> </div>
@ -232,7 +232,7 @@ $(document).ready(function() {
</div> </div>
</div> </div>
<div class="overlay"> <div class="overlay">
<div class="overlayCont" style="background-color:{{divColor 'header'}}"> <div class="overlayCont" style="background-color:{{divColor 'mainColor'}}">
<p>{{confirmText}}</p> <p>{{confirmText}}</p>
<div id="faCont"> <div id="faCont">
<i class="fa fa-check-circle-o" aria-hidden="true"></i> <i class="fa fa-check-circle-o" aria-hidden="true"></i>
@ -241,7 +241,7 @@ $(document).ready(function() {
</div> </div>
</div> </div>
<div id="createdClasses" style="background-color:{{divColor 'cards'}};right:{{ownedStatus}}" classid="{{selectedClass '_id'}}"> <div id="createdClasses" style="background-color:{{divColor 'secondaryColor'}};right:{{ownedStatus}}" classid="{{selectedClass '_id'}}">
<h3>{{selectedClass 'name'}}</h3> <h3>{{selectedClass 'name'}}</h3>
<h4 id="codetext">Code:</h4> <h4 id="codetext">Code:</h4>
<input id="code" value="{{selectedClass 'code'}}" type="text" readonly> <input id="code" value="{{selectedClass 'code'}}" type="text" readonly>
@ -278,7 +278,7 @@ $(document).ready(function() {
<div id="deleteClass">Delete Class</div> <div id="deleteClass">Delete Class</div>
</div> </div>
<div id="joinPrivClass" style="background-color:{{divColor 'cards'}};bottom:{{privStatus}}"> <div id="joinPrivClass" style="background-color:{{divColor 'secondaryColor'}};bottom:{{privStatus}}">
<h3>Enter Code:</h3> <h3>Enter Code:</h3>
<input id="privateCode" type="text" placeholder="Enter code here..."> <input id="privateCode" type="text" placeholder="Enter code here...">
<h4 id="privSubmit">Submit</h4> <h4 id="privSubmit">Submit</h4>

9
hourglass/client/profile/profile.js
View File

@ -76,16 +76,15 @@ Template.profile.helpers({
return Session.get("user").name; return Session.get("user").name;
}, },
motd() { // Returns the current user's description motd() { // Returns the current user's description
console.log(Session.get("user").description); if (Session.get("user").description !== undefined && Session.get("user").description !== null) return Session.get("user").description;
if (Session.get("user").description !== "") return Session.get("user").description;
return "Say something about yourself!"; return "Say something about yourself!";
}, },
school() { // Returns the current user's school's name school() { // Returns the current user's school's name
if (Session.get("user").school !== undefined) return Session.get("user").school; if (Session.get("user").school !== undefined && Session.get("user").school !== null) return Session.get("user").school;
return "Click here to edit..."; return "Click here to edit...";
}, },
grade() { // Returns the current user's grade grade() { // Returns the current user's grade
if (Session.get("user").grade !== undefined) return Session.get("user").grade + "th"; if (Session.get("user").grade !== undefined && Session.get("user").grade !== null) return Session.get("user").grade + "th";
return "Click here to edit..."; return "Click here to edit...";
}, },
classes() { // Loads all of the possible classes ( Limit of twenty shown ) ( Sorts by class size ) classes() { // Loads all of the possible classes ( Limit of twenty shown ) ( Sorts by class size )
@ -119,7 +118,7 @@ Template.profile.helpers({
}, },
profClassTabColor(status) { // Change this [Supposed to show the current mode that's selected via color]     profClassTabColor(status) { // Change this [Supposed to show the current mode that's selected via color]    
if (Session.equals("profClassTab",status)) {             if (Session.equals("profClassTab",status)) {            
return themeColors[Meteor.user().profile.preferences.theme].highlightText;         return themeColors[Meteor.user().profile.preferences.theme].modeHighlight;        
} else {             } else {            
return;         return;        
}     }    

85
hourglass/lib/constants.js
View File

@ -1,32 +1,69 @@
themeColors = { themeColors = {
"light": { "light": {
"background": "White.jpg", "background": "White.jpg",
"header": "#EBEBEB", "mainColor": "#EBEBEB",
"sidebar": "#65839A", "secondaryColor": "#FEFEFE",
"dropdown": "#E6E6E6", "sidebarColor": "#65839A",
"adminButtons": "#C8C0C0", "userDropdownColor": "#E6E6E6",
"funcButton": "#849CAE", "iconHighlight": "#33ADFF",
"statusIcons": "#33ADFF", "modeHighlight": "#FF1A1A",
"highlightText": "#FF1A1A", "classCardColor":"#EBEBEB",
"cards": "#FEFEFE", "textColor": "#000"
"classes":"#EBEBEB",
"calendar": "#000",
"text": "#000"
}, },
"dark": { /*"dark": {
"background": "Black.jpg", "background": "Black.jpg",
"header": "#373A56", "mainColor": "#373A56",
"sidebar": "#35435D", "secondaryColor": "#151A2B",
"dropdown": "#373A56", "sidebarColor": "#35435D",
"adminButtons": "#63667E", "userDropdownColor": "#373A56",
"funcButton": "#5D75A2", "iconHighlight": "#33ADFF",
"statusIcons": "#33ADFF", "modeHighlight": "#FF1A1A",
"highlightText": "#FF1A1A", "classCardColor":"#46396E",
"cards": "#151A2B", "textColor": "#F6F6F6"
"classes":"#46396E", },*/
"calendar": "#000", /*"dark": {
//30313B "background": "RedBlack.png",
"text": "#F6F6F6" "mainColor": "#302c36",
"secondaryColor": "#151313",
"sidebarColor": "#327c5a",
"userDropdownColor": "#cc3333",
"iconHighlight": "#327c5a",
"modeHighlight": "#c9fe62",
"classCardColor":"#302c36",
"textColor": "#fcf0f0"
},*/
/*"dark": {
"background": "Sea.png",
"mainColor": "#1e926c",
"secondaryColor": "#1c564f",
"sidebarColor": "#3cb08a",
"userDropdownColor": "#2ea96a",
"iconHighlight": "#61d9a3",
"modeHighlight": "#c9fe62",
"classCardColor":"#2567a1",
"textColor": "#fcf0f0"
},*/
/*"dark": {
"background": "Earth.png",
"mainColor": "#dea743",
"secondaryColor": "#496234",
"sidebarColor": "#6d9957",
"userDropdownColor": "#89bb52",
"iconHighlight": "#91ee61",
"modeHighlight": "#b9f643",
"classCardColor":"#c18311",
"textColor": "#fcf0f0"
},*/
"dark": {
"background": "NeonBlue.png",
"mainColor": "#1d1c23",
"secondaryColor": "#1f212f",
"sidebarColor": "#312e32",
"userDropdownColor": "#2e312b",
"iconHighlight": "#70e6e6",
"modeHighlight": "#70e6e6",
"classCardColor":"#1faab1",
"textColor": "#fcf0f0"
} }
}; };