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

merge conflict

Browse Source
This commit is contained in:
yamanq 2016-08-12 00:57:04 -04:00
commit 7032b30aa1
7 changed files with 334 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hourglass/client/login/login.css
View File

@ -78,6 +78,7 @@ h2.text {
p.text {
font-size: 150%;
margin-bottom: 5%;
}
#loginButton {

2
hourglass/client/login/login.html
View File

@ -6,7 +6,7 @@
<div id="progress" style="background-color:{{loadType}};width:{{loadPercent}}"></div>
</div>
</header>
<div id="loginMain">
<div id="loginMain" style="background-size:{{width}}">
<div id="circle" style="width:{{dim}};height:{{dim}};margin:{{margin}}">
<div id="loginContent" style="width:{{contDim}};height:{{contDim}};margin:{{contMargin}}">
<h2 class="text">Hourglass</h2>

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

@ -38,6 +38,38 @@ html {
user-select: none;
}
::-webkit-input-placeholder {
font-size: 70%;
}
:-moz-placeholder {
font-size: 70%;
}
::-moz-placeholder {
font-size: 70%;
}
:-ms-input-placeholder {
font-size: 70%;
}
.formInvalid::-webkit-input-placeholder {
color: red;
}
.formInvalid:-moz-placeholder {
color: red;
}
.formInvalid::-moz-placeholder {
color: red;
}
.formInvalid:-ms-input-placeholder {
color: red;
}
body {
margin: 0;
}

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

@ -4,6 +4,10 @@
cursor: pointer;
}
.radio {
cursor: pointer;
}
.changeInput {
font-size: 100%;
padding: 0;
@ -15,6 +19,7 @@
font-size: 150%;
font-weight: 400;
margin: 0;
margin-bottom: 1%;
}
.profHea {
@ -82,6 +87,8 @@
position: absolute;
display: none;
z-index: 5;
opacity: 0;
-webkit-transition: opacity 0.4s ease;
@ -90,10 +97,12 @@
transition: opacity 0.4s ease;
}
.profOptions p {
.profOptionText {
font-size: 150%;
min-width: 10%;
padding: 20px;
margin: 0;
padding: 20%;
text-align: center;
cursor: pointer;
@ -144,8 +153,6 @@
}
#profClassInfoHolder {
-webkit-transition: opacity 0.4s ease;
-moz-transition: opacity 0.4s ease;
-ms-transition: opacity 0.4s ease;
@ -231,6 +238,17 @@
overflow-y: scroll;
}
.classHolder h3 {
font-style: italic;
font-weight: 200;
margin-left: 1%;
color: #999;
-webkit-filter :none;
filter: none;
}
.classBox {
font-size: 150%;
width: 100%;
@ -273,10 +291,57 @@
width: 13%;
}
#creRules {
position: absolute;
}
#create {
margin-top: 2.5%;
padding: 5%;
padding-top: 1%;
}
#create div {
margin: 2%;
margin-left: 11%;
margin-bottom: 5%;
display: inline-block;
}
.creInput {
font-size: 120%;
padding: 3%;
}
.creOp {
margin: 0 !important;
}
.-autocomplete-container {
margin: 0.5% 0 0 0 !important;
display: none;
}
#creSubmit {
font-weight: 200;
font-size: 140%;
margin: 0 35% 0 35%;
padding: 2%;
background-color: rgba(0,0,0,0.25);
text-align: center;
cursor: pointer;
-webkit-transition: background-color 0.4s ease;
-moz-transition: background-color 0.4s ease;
-ms-transition: background-color 0.4s ease;
transition: background-color 0.4s ease;
}
#creSubmit:hover {
background-color: rgba(0,0,0,0.15);
}
#restrict {
font-size: 100%;
font-style: italic;
@ -316,6 +381,7 @@
#save h2 {
font-weight: 200;
width: 100%;
padding: 8%;
-webkit-filter: none;

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

@ -19,13 +19,13 @@
<div>
<div>
<p class="profTitle">Grade:</p>
<span class="change radio" op="0" re="readonly" id="grade">{{grade}}</span>
<span class="change radio" opc="0" op="0" re="readonly" id="grade">{{grade}}</span>
</div>
<div class="profOptions" style="background-color:{{divColor 'header'}}">
<p>9th</p>
<p>10th</p>
<p>11th</p>
<p>12th</p>
<p class="profOptionText">9th</p>
<p class="profOptionText">10th</p>
<p class="profOptionText">11th</p>
<p class="profOptionText">12th</p>
</div>
</div>
</div>
@ -56,9 +56,9 @@
<span class="subscriptions classText">Members</span>
</div>
<div class="classHolder" style="max-height:{{classHolderHeight}}">
{{#each myclasses}}
<!-- {{#each myclasses}}
{{> classDisplay}}
{{/each}}
{{/each}} -->
</div>
{{/if}}
@ -80,39 +80,51 @@
{{#each autocompleteClasses}}
{{> classDisplay}}
{{/each}}
{{#if notfound}}
<h3>No results found...</h3>
{{/if}}
{{/if}}
</div>
{{/if}}
{{#if profClassTab "creClass"}}
<!-- <form id="create">
<p class="input">School:</p><br>
{{> inputAutocomplete settings=schoolcomplete class="form-control creInput" type="text" name="school" placeholder="Example: International Academy" }}
<p class="input">Hour:</p><br>
<input class="creInput" type="text" name="hour"><br>
<p class="input">Teacher:</p><br>
{{> inputAutocomplete settings=teachercomplete class="form-control creInput" type="text" name="teacher" placeholder="Example: Woods" }}
<p class="input">Class Name:</p><br>
<input class="creInput" type="text" name="classname"><br>
<p class="input">Privacy:</p><br>
<div class="select">
<input class="creInputSel creInput" type="text" name="privacy" op="0" readonly><br>
<div class="creOptions" style="background-color:{{divColor 'header'}}">
<p>Public</p>
<p>Private</p>
</div>
<div id="creRules"><p>Insert description and rules of create a class --Will style later--</p></div>
<form id="create">
<div>
<p class="profTitle">School:</p>
{{> inputAutocomplete settings=schoolcomplete class="form-control creInput" type="text" name="school" placeholder="Example: International Academy" }}
</div>
<div>
<p class="profTitle">Hour:</p>
<input class="creInput" type="text" name="hour">
</div>
<p class="input">Category:</p><br>
<div class="select">
<input class="creInputSel creInput" type="text" name="category" op="1" readonly><br>
<div class="creOptions" style="background-color:{{divColor 'header'}}">
<p>Class</p>
<p>Club</p>
<p>Other</p>
<div>
<p class="profTitle">Teacher:</p>
{{> inputAutocomplete settings=teachercomplete class="form-control creInput" type="text" name="teacher" placeholder="Example: Woods" }}
</div>
<div>
<p class="profTitle">Class Name:</p>
<input class="creInput" type="text" name="classname">
</div>
<div>
<p class="profTitle">Privacy:</p>
<input class="creInput radio op" type="text" name="privacy" opc="1" op="1" readonly>
<div class="profOptions creOp" style="background-color:{{divColor 'header'}}">
<p class="profOptionText">Public</p>
<p class="profOptionText">Private</p>
</div>
</div>
<div class="creSubmit">Submit Request</div>
</form> -->
</div>
<div>
<p class="profTitle">Category:</p>
<input class="creInput radio op" type="text" name="category" opc="1" op="2" readonly>
<div class="profOptions creOp" style="background-color:{{divColor 'header'}}">
<p class="profOptionText">Class</p>
<p class="profOptionText">Club</p>
<p class="profOptionText">Other</p>
</div>
</div>
<h3 id="creSubmit" style="margin-left:{{submitMargin}}">Submit Request</h3>
</form>
{{/if}}
</div>
</div>

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

@ -82,15 +82,15 @@ Template.profile.helpers({
avatar() {
var dim = window.innerWidth * 1600/1920 * .16;
if(Meteor.user().profile.avatar !== undefined) {
var pic = Meteor.users().profile.avatar;
var pic = "\'"+Meteor.user().profile.avatar+"\'";
} else {
var pic = "defaultAvatars/"+(Math.floor(Math.random() * (10 - 1)) + 1).toString()+".png";
var pic = "defaultAvatars/"+(Math.floor(Math.random() * (11 - 1)) + 1).toString()+".png";
}
return "background-image:url("+pic+");background-size:"+dim.toString()+"px "+dim.toString()+"px";
},
avatarDim() {
var dim = window.innerWidth * 1600/1920 * .16;
return "height:"+dim.toString()+"px;width:"+dim.toString()+"px;top:"+.43*window.innerHeight.toString()+"px";
return "height:"+dim.toString()+"px;width:"+dim.toString()+"px;top:"+.43*window.innerHeight.toString()+"px;";
},
username() {
return Meteor.user().profile.name;
@ -111,7 +111,7 @@ Template.profile.helpers({
},
grade() {
if(Meteor.user().profile.grade !== undefined) {
return Meteor.user().profile.grade;
return Meteor.user().profile.grade+"th";
} else {
return "Click here to edit...";
}
@ -145,8 +145,15 @@ Template.profile.helpers({
autocompleteClasses() {
return Session.get("autocompleteDivs");
},
myclasses() {
return Meteor.user().profile.classes;
/*myclasses() {
if (Meteor.user().profile.classes === undefined || Meteor.user().profile.classes.length === 0) {
return [];
} else {
return Meteor.user().profile.classes;
}
},*/
notfound() {
return Session.get("notfound");
},
confirmText() {
return Session.get("confirmText");
@ -154,26 +161,17 @@ Template.profile.helpers({
})
Template.profile.events({
'click #profile input' (event) {
var opened = Session.get("profradioDiv");
if(opened !== null && opened !== event.target.getAttribute("op")) {
closeDivFade(document.getElementsByClassName("creInputSel")[opened].parentNode.childNodes[4]);
}d
},
'click .profInputSel' (event) {
Session.set("profradioDiv", event.target.getAttribute("op"));
openDivFade(event.target.parentNode.childNodes[4]);
},
'click profOptions p' (event) {
var p = event.target;
p.parentNode.parentNode.childNodes[1].value = p.childNodes[0].nodeValue;
closeDivFade(p.parentNode);
Session.set("radioDiv",null);
Session.set("radioOffset",null);
},
'click .change' (event) {
var ele = event.target;
var sessval = Session.get("modifying");
if(ele.id !== sessval && sessval != null) closeInput(sessval);
if(ele.id !== sessval && sessval !== null) closeInput(sessval);
Session.set("modifying", ele.id);
var dim = ele.getBoundingClientRect();
@ -191,9 +189,11 @@ Template.profile.events({
input.style.width = "70%";
input.style.padding = "0.1%";
input.id = ele.id+"a";
input.setAttribute("opc",ele.getAttribute("opc"));
ele.parentNode.appendChild(input);
if(ele.getAttribute("re") == "readonly") {
input.readOnly = true;
input.className += " op";
input.style.cursor = "pointer";
} else {
input.select();
@ -219,10 +219,18 @@ Template.profile.events({
!event.target.parentNode.className.includes("profOptions")) {
closeInput(sessval);
}
if(!event.target.className.includes("radio") &&
if(!event.target.className.includes("radio") &&
!Session.equals("radioDiv",null) &&
!event.target.parentNode.className.includes("profOptions")) {
closeDivFade(document.getElementsByClassName("profOptions")[Session.get("radioDiv")]);
!event.target.parentNode.className.includes("profOptions") &&
event.target.readOnly !== true) {
var opnum = (parseInt(Session.get("radioDiv"))-parseInt(Session.get("radioOffset"))).toString();
for(var i = 0; i < document.getElementsByClassName("profOptions").length; i++) {
try {
closeDivFade(document.getElementsByClassName("profOptions")[i]);
} catch(err) {}
}
Session.set("radioDiv",null);
Session.set("radioOffset",null);
}
},
'keydown' (event) {
@ -232,37 +240,54 @@ Template.profile.events({
closeInput(sessval);
} catch(err) {}
}
if(sessval !== null && event.keyCode !== 13) {
var restrict = document.getElementById(sessval).getAttribute("restrict");
if(restrict !== null) {
var num = parseInt(restrict)-event.target.value.length;
var restext = document.getElementById("restrict");
if(num === 1) {
restext.childNodes[0].nodeValue = num.toString()+" character left";
restext.style.setProperty("color","#999","important");
} else if(num <= 0) {
var input = document.getElementById(sessval+"a");
input.value = input.value.substring(0,parseInt(restrict));
restext.childNodes[0].nodeValue = "0 characters left";
restext.style.setProperty("color","#FF1A1A","important");
} else {
restext.childNodes[0].nodeValue = num.toString()+" characters left";
restext.style.setProperty("color","#999","important");
if(restrict !== null) {
var num = parseInt(restrict)-event.target.value.length;
var restext = document.getElementById("restrict");
if(num === 1) {
restext.childNodes[0].nodeValue = num.toString()+" character left";
restext.style.setProperty("color","#999","important");
} else if(num <= 0) {
var input = document.getElementById(sessval+"a");
input.value = input.value.substring(0,parseInt(restrict));
restext.childNodes[0].nodeValue = "0 characters left";
restext.style.setProperty("color","#FF1A1A","important");
} else {
restext.childNodes[0].nodeValue = num.toString()+" characters left";
restext.style.setProperty("color","#999","important");
}
}
}
},
'click .radio' (event) {
Session.set("radioDiv", event.target.getAttribute("op"));
openDivFade(event.target.parentNode.parentNode.childNodes[3]);
var op = event.target;
Session.set("radioDiv", op.getAttribute("op"));
Session.set("radioOffset", op.getAttribute("opc"));
try {
for(var i = 0; i < document.getElementsByClassName("profOptions").length; i++) {
var curr = document.getElementsByClassName("profOptions")[i];
if(Session.get("radioDiv") !== i.toString()) {
closeDivFade(document.getElementsByClassName("profOptions")[i]);
}
}
} catch(err) {}
openDivFade(document.getElementsByClassName("profOptions")[op.getAttribute("op")]);
},
'click .profOptions p' (event) {
var sessval = Session.get("modifying");
var p = event.target;
var input = p.parentNode.parentNode.childNodes[1].childNodes[5];
var opnum = (parseInt(Session.get("radioDiv"))-parseInt(Session.get("radioOffset"))).toString();
var input = document.getElementsByClassName("op")[opnum];
input.value = p.childNodes[0].nodeValue;
closeInput(sessval);
try{
closeInput(sessval);
} catch(err) {}
closeDivFade(p.parentNode);
input.focus();
Session.set("radioDiv",null)
Session.set("radioDiv",null);
Session.set("radioOffset",null);
},
'click .addClass' () {
        var functionHolder = document.getElementById("profClassInfoHolder")
@ -300,9 +325,15 @@ Template.profile.events({
} else {
Session.set("notsearching",false);
}
divs = [];
Session.set("autocompleteDivs",null);
var divs = [];
try {
var items = document.getElementsByClassName("-autocomplete-container")[0].childNodes[3].childNodes;
if(items.length === 0) {
Session.set("notfound",true);
} else {
Session.set("notfound",false);
}
for(var i = 2; i < items.length; i+=3) {
var item = items[i].childNodes[3];
divs.push({
@ -317,14 +348,21 @@ Template.profile.events({
} catch(err) {}
},
'click .classBox' (event) {
if(event.target.getAttribute("classid") === null) return;
if(event.target.id === "label") return;
if(event.target.className !== "classBox") {
var attribute = event.target.parentNode.getAttribute("classid");
} else {
var attribute = event.target.getAttribute("classid");
}
var data = [attribute,""];
Session.set("serverData",data);
Session.set("confirm","joinClass");
Session.set("confirmText","Join class?");
openDivFade(document.getElementsByClassName("overlay")[0]);
setTimeout(function() {
document.getElementsByClassName("overlay")[0].style.opacity = "1";
}, 200);
Session.set("serverData",[event.target.getAttribute("classid"),""]);
Session.set("confirm","joinClass");
Session.set("confirmText","Join class?");
},
'click .fa-check-circle-o' () {
sendData(Session.get("confirm"));
@ -334,24 +372,42 @@ Template.profile.events({
},
'click .fa-times-circle-o' () {
closeDivFade(document.getElementsByClassName("overlay")[0]);
closeDivFade(document.getElementById("functionHolder"));
Session.set("serverData",null);
Session.set("confirm",null);
},
'click #save' () {
Session.set("serverData",getProfileData());
Session.set("confirm","editProfile");
Session.set("confirmText", "Save new profile settings?");
openDivFade(document.getElementsByClassName("overlay")[0]);
setTimeout(function() {
document.getElementsByClassName("overlay")[0].style.opacity = "1";
}, 200);
getProfileData();
Session.set("serverData",getProfileData());
Session.set("confirm","editProfile");
Session.set("confirmText", "Save new profile settings?");
},
'click #creSubmit' () {
var data = getCreateFormData();
if(data == null) return;
Session.set("serverData",data);
Session.set("confirm","createClass");
Session.set("confirmText", "Submit request?");
openDivFade(document.getElementsByClassName("overlay")[0]);
setTimeout(function() {
document.getElementsByClassName("overlay")[0].style.opacity = "1";
}, 200);
},
'focus .op' (event) {
event.target.click();
}
})
function openDivFade(div) {
div.style.display = "block";
if(div.className === "profOptions") {
div.style.display = "inline-block";
} else {
div.style.display = "block";
}
div.style.opacity = "0";
setTimeout(function() {
div.style.opacity = "1";
@ -387,7 +443,55 @@ function sendData(funcName) {
}
function getProfileData() {
var desc = document.getElementById("motd").childNodes[0].nodeValue;
var description = document.getElementById("motd").childNodes[0].nodeValue;
var school = document.getElementById("school").childNodes[0].nodeValue;
var grade = document.getElementById("grade").childNodes[0].nodeValue;
var gradein = document.getElementById("grade").childNodes[0].nodeValue;
var grade = parseInt(gradein.substring(gradein.length-2,gradein));
var avatar = document.getElementById("profAvatar").style.backgroundImage.replace(")","").replace("url(","").replace("\"","").replace("\"","");
var banner = document.getElementById("profBanner").style.backgroundImage.replace(")","").replace("url(","").replace("\"","").replace("\"","");
return {
school: school,
grade: grade,
description: description,
avatar: avatar,
banner: banner
};
}
function getCreateFormData() {
var stop;
var form = document.getElementsByClassName("creInput");
for(var i = 0; i < form.length; i++) {
if(form[i].value === "") {
form[i].focus();
form[i].placeholder = "Missing field";
form[i].className += " formInvalid";
stop = true;
} else {
form[i].className = form[i].className.replace(" formInvalid","");
}
}
if(stop) return null;
var school = form[0].value;
var hour = form[1].value;
var teacher = form[2].value;
var name = form[3].value;
if(form[4].value == "public") {
var privacy = false;
} else {
var privacy = true;
}
var category = form[5].value;
return {
school: school,
hour: hour,
teacher: teacher,
name: name,
privacy: privacy,
category: category,
status: false,
code: ""
};
}

45
hourglass/server/main.js
View File

@ -91,17 +91,15 @@ Meteor.methods({
},
'editProfile': function(change) {
current = Meteor.user().profile;
current.school = change[0];
current.grade = change[1];
current.description = change[2];
current.avatar = change[3];
current.banner = change[4];
current.preferences = change[5];
current.school = change.school;
current.grade = change.grade;
current.description = change.description;
current.avatar = change.avatar;
current.banner = change.banner;
current.preferences = change.preferences
if (schools.findOne({name:current.school}) != null &&
Number.isInteger(current.grade) &&
current.grade >= 9 &&
current.grade <= 12 &&
current.grade >= 9 && current.grade <= 12 &&
current.description.length <= 50) {
Meteor.users.update({_id: Meteor.userId()}, {$set: {profile: current}});
@ -110,22 +108,30 @@ Meteor.methods({
return 0;
}
},
'joinClass': function(change, pass) {
found = classes.findOne({_id: change, status: true});
'joinClass': function(input) {
change = input[0];
pass = input[1];
if(Meteor.user().profile.classes === undefined) {
curr = Meteor.user().profile;
curr.classes = [];
Meteor.users.update({_id: Meteor.userId()}, {$set: {profile: curr}})
}
prof = Meteor.user().profile;
found = classes.findOne({_id: change, status: true});
if (Meteor.user() != null &&
found != null &&
pass === found.code &&
found.banned.indexOf(Meteor.userId()) === -1 &&
Meteor.user().profile.classes.indexOf(change) === -1) {
!found.banned.includes(Meteor.userId()) &&
!prof.classes.includes(change)) {
current = Meteor.user().profile;
current.classes.append(change);
Meteor.users.update({_id: Meteor.userId()}, {$set: {profile: current}});
return 1;
} else {
return 0;
}
}
},
'leaveClass': function(change) {
if (Meteor.user() != null) {
@ -143,4 +149,11 @@ Meteor.methods({
}
}
});
});
function has(array, has) {
for(var i = 0; i < array.length; i++) {
if(array[i] === has) return true;
}
return false;
}