Skip to content

Recent #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PrernaGargPG merged 9 commits into from
Apr 2, 2016
Merged

Recent #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4e9193f
Merge pull request #1 from PrernaGargPG/master
rohanjaswal2507 Apr 2, 2016
9bf23cd
link eventList template to collection
rohanjaswal2507 Apr 2, 2016
6aa2c33
Merge pull request #2 from PrernaGargPG/master
rohanjaswal2507 Apr 2, 2016
8e43b98
Merge branch 'master' of https://github.com/rohanjaswal2507/hackathonApp
rohanjaswal2507 Apr 2, 2016
6475bc6
add method for addEvent autoform
rohanjaswal2507 Apr 2, 2016
9ef24e4
eventPage added
Apr 2, 2016
e10c45f
Merge pull request #1 from rohanjaswal2507/master
mysterious-29 Apr 2, 2016
ef72635
Merge branch 'master' of https://github.com/mysterious-29/hackathonApp
Apr 2, 2016
28ac019
Merge pull request #3 from mysterious-29/master
rohanjaswal2507 Apr 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .meteor/packages
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,5 @@ aldeed:autoform
standard-minifier-css
standard-minifier-js
yogiben:autoform-file
tsega:bootstrap3-datetimepicker
drewy:autoform-datetimepicker
2 changes: 2 additions & 0 deletions .meteor/versions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ ddp-rate-limiter@1.0.2
ddp-server@1.2.4
deps@1.0.10
diff-sequence@1.0.3
drewy:autoform-datetimepicker@1.0.666666
ecmascript@0.4.1
ecmascript-runtime@0.2.8
ejson@1.0.9
Expand Down Expand Up @@ -119,6 +120,7 @@ standard-minifier-js@1.0.4
templating@1.1.7
templating-tools@1.0.2
tracker@1.0.11
tsega:bootstrap3-datetimepicker@4.17.37_1
twbs:bootstrap@3.3.6
ui@1.0.9
underscore@1.0.6
Expand Down
Binary file added SpicMacay.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 5 additions & 35 deletions client/eventList.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,50 +1,20 @@
<template name="eventList">
<br><br>
<div class="jumbotron" id="heading">
<h1 color="#FFFFFF">Upcoming Events</h1>
<h1>Upcoming Events</h1>
</div>

<div class="container-fluid">

{{#each events}}
<div class="col-sm-3" id="e">
<a href="https://google.com">
<div class="event">Event 1</div>
<div class="desc">Lorem ipsum dolor sit amet, consectetur adipisicing elit.<br>Date: 25/05/2016<br>Time: 5:00 p.m.</div>
<div class="event">{{title}}</div>
<div class="desc">{{description}}<br>Date: {{startTime}}</div>
<div class="photos">
<img src="image.jpg" alt="Event image" width="278" height="210">
</div>
</a>
</div>

<div class="col-sm-3" id="e">
<a href="https://google.com">
<div class="event">Event 2</div>
<div class="desc">Lorem ipsum dolor sit amet, consectetur adipisicing elit.<br>Date: 25/05/2016<br>Time: 5:00 p.m.</div>
<div class="photos">
<img src="image.jpg" alt="Event image" width="278" height="210">
</div>
</a>
</div>

<div class="col-sm-3" id="e">
<a href="https://google.com">
<div class="event">Event 3</div>
<div class="desc">Lorem ipsum dolor sit amet, consectetur adipisicing elit.<br>Date: 25/05/2016<br>Time: 5:00 p.m.</div>
<div class="photos">
<img src="image.jpg" alt="Event image" width="278" height="210">
</div>
</a>
</div>

<div class="col-sm-3" id="e">
<a href="https://google.com">
<div class="event">Event 4</div>
<div class="desc">Lorem ipsum dolor sit amet, consectetur adipisicing elit.<br>Date: 25/05/2016<br>Time: 5:00 p.m.</div>
<div class="photos">
<img src="image.jpg" alt="Event image" width="278" height="210">
</div>
</a>
</div>
{{/each}}
</div>

</template>
3 changes: 2 additions & 1 deletion client/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ Template.eventList.helpers({
date = Session.get("current_date");
date = Date.parse(date);
date = date.toString();
eventList = Events.find({startTime: {$gt: date}}, {"sort" : {'startTime':1}} );
eventList = Events.find({});

return eventList;
}
});
Expand Down
78 changes: 78 additions & 0 deletions event.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
#col-1{
border: 2px solid red;
}
.jumbotron{
text-align: center;
background-color:#23282D;
color: white;
height: 350px;
background-image: url('SpicMacay.jpg');
background-size: 100% 100%;
}

.row{
left: 0px;
}

.image{
position: absolute;
top: 0px;
opacity: 0.5;

}

#b1{
position: absolute;
background-color: #708090;
border-radius: 8px;
top: 250px;
left: 570px;
color: white;
width: 150px;
height: 40px;
z-index: 1;
}

#img{
width:400px;
height: 200px;
}

#b1:hover{
background-color: white;
box-shadow: 0px 4px 4px;
color: black;
}

#detail{
background-color: #2F4F4F;
border-radius: 10px;
color: white;
}

#overview{
background-color: #2F4F4F;
border-radius:5px;
color: white;
height: 200px;

}



.col-md-3{
left: 100px;
margin-left: 5px;
margin-top: 40px;
}

.col-md-4{
background-color: #2F4F4F;
border-radius:5px;
color: white;
height: 300px;
left: 140px;
margin-left: 5px;
margin-top: 40px;
margin-bottom: 20px;
}
62 changes: 62 additions & 0 deletions event.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>EVENT one</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="event.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.0/jquery.min.js"></script>
<script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
</head>
<body>

<div class="container" >

<div class="jumbotron">


<button id="b1">Register Now >></button>
</div>
<div class="row">
<div class="col-md-3" id="overview">
<h3><strong>About</strong> </h3>
<p>Event Owner: Team .EXE</p>

</div>
<div class="col-md-3" id="overview">
<h3><strong>Details</strong></h3>
<ul>

<li>Coding event</li>
<li></li>
<li>Exiting Prices</li>
</ul>
</div>

<div class="col-md-3" id="overview">
<h3><strong>OverView</strong></h3>
<p>Started On : <b> hh:mm </b> </p>
<p>Closes On : <b> hh:mm </b> </p>
<p>Location : <b> Auditorium </b> </p>
</div>
</div>

<div class="row">
<div class="col-md-4">
<h3><strong> Detailed Description </strong></h3>
<p> </p>
<p> </p>
</div>

<div class="col-md-4">
<h3><strong>Rules</strong></h3>
<p> </p>
<p> </p>
</div>

</div>
</div>

</body>
</html>
15 changes: 15 additions & 0 deletions shared/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Meteor.methods({
addEvent: function(newEvent){
user = Meteor.users.findOne({_id:Meteor.userId()});
if (user.emails){
if (Meteor.userId()){
newEvent.startTime = Date.parse(newEvent.startTime);
newEvent.endTime = Date.parse(newEvent.endTime);
newEvent.author = Meteor.userId();
Events.insert(newEvent);
}
} else {
alert("You are not authorized to post an Event");
}
}
});