Updated layout

This commit is contained in:
Luke Vella 2015-02-02 23:34:44 +01:00
parent 62c1e6fea5
commit 24a1629fe1
19 changed files with 330 additions and 302 deletions

View file

@ -1,196 +1,196 @@
/*
Email Notifications Helper Class
*/
var app = require('../app');
var communicator = require('../communicator');
var debug = require('debug')('rallly');
var mandrill = require('mandrill-api');
var mandrill_client = new mandrill.Mandrill(app.get('mandrillAPIKey'));
communicator.on('event:create', function(event){
if (!event.creator.allowNotifications && event.isClosed) return;
sendEmailConfirmation(event);
sendInvites(event);
});
communicator.on('event:update:creator.email', function(event, oldEvent){
if (!event.creator.allowNotifications && event.isClosed) return;
verifyEmail(event);
});
communicator.on('event:delete', function(event){
deleteConfirmation(event);
});
// Send confirmation to the creator of the event with a link to verify the creators email address
var sendEmailConfirmation = function(event){
var message = {
subject : "Rallly: " + event.title + " - Verify Email Address",
from_email : 'noreply@rallly.co',
from_name : 'Rallly',
to: [{
'email': event.creator.email
}],
global_merge_vars : [{
'name' : 'TITLE',
'content' : 'Your event ' + event.title + ' has been created successfully.'
}, {
'name' : 'MESSAGE',
'content' : 'Hi ' + event.creator.name + ',<br /><br />' +
'An email has been sent to each participant with a link to the event.<br /><br />' +
'Important: To continue receiving email notifications about this event, please click the button below to verify your email address.'
}, {
'name' : 'BUTTONTEXT',
'content' : 'Verify Email Address'
}, {
'name' : 'BUTTONLINK',
'content' : app.get('absoluteUrl')('verify/'+event._id+'/code/'+event.__private.verificationCode)
}]
}
mandrill_client.messages.sendTemplate({
message : message,
template_name : 'rallly-standard',
async : true,
template_content : []
}, mandrillSuccessHandler, mandrillErrorHandler);
}
// Send an invite to all participants of the evnet
var sendInvites = function(event){
event.emails.forEach(function(item){
var toEmail = item.email;
var message = {
subject : "Rallly: " + event.title,
from_email : 'noreply@rallly.co',
from_name : 'Rallly',
to: [{
'email': toEmail
}],
headers : {
'Reply-To' : event.creator.email
},
global_merge_vars : [{
'name' : 'TITLE',
'content' : event.creator.name + ' has invited you to participate in their event: ' + event.title, }, {
'name' : 'MESSAGE',
'content' : 'Rallly is a free collaborative scheduling service that lets you and your friends vote on a date to host an event. ' +
'Click on the button below to visit the event page and vote on the dates that best suit you. '
}, {
'name' : 'BUTTONTEXT',
'content' : 'View Event'
}, {
'name' : 'BUTTONLINK',
'content' : app.get('absoluteUrl')(event._id)
}]
}
mandrill_client.messages.sendTemplate({
message : message,
template_name : 'rallly-standard',
async : true,
template_content : []
}, mandrillSuccessHandler, mandrillErrorHandler);
})
}
// This message is sent when the user want to verify an email address after the event has been created
var verifyEmail = function(event){
var message = {
subject : "Rallly: " + event.title + " - Verify Email Address",
from_email : 'noreply@rallly.co',
from_name : 'Rallly',
to: [{
'email': event.creator.email
}],
global_merge_vars : [{
'name' : 'TITLE',
'content' : 'Please verify your email address to receive updates from this event.'
}, {
'name' : 'MESSAGE',
'content' : 'Hi ' + event.creator.name + ',<br /><br />' +
'If you would like to receive email updates from this event, please click on the button below to verify your email address.'
}, {
'name' : 'BUTTONTEXT',
'content' : 'Verify Email Address'
}, {
'name' : 'BUTTONLINK',
'content' : app.get('absoluteUrl')('verify/'+event._id+'/code/'+event.__private.verificationCode)
}]
}
mandrill_client.messages.sendTemplate({
message : message,
template_name : 'rallly-standard',
async : true,
template_content : []
}, mandrillSuccessHandler, mandrillErrorHandler);
}
var sendUpdate = function(event){
var message = {
subject : "Rallly: " + event.title + " - Verify Email Address",
from_email : 'noreply@rallly.co',
from_name : 'Rallly',
to: [{
'email': event.creator.email
}],
global_merge_vars : [{
'name' : 'Name',
'content' : event.creator.name
}, {
'name' : 'Event',
'content' : event.title
}, {
'name' : 'VerifyUrl',
'content' : app.get('absoluteUrl')('verify/'+event._id+'/code/'+event.creator.verificationCode)
}]
}
mandrill_client.messages.sendTemplate({
message : message,
template_name : 'rallly-standard',
async : true,
template_content : []
}, mandrillSuccessHandler, mandrillErrorHandler);
}
var deleteConfirmation = function(event){
var message = {
subject : "Rallly: " + event.title + " - Delete Request",
from_email : 'noreply@rallly.co',
from_name : 'Rallly',
to: [{
'email': event.creator.email
}],
global_merge_vars : [{
'name' : 'TITLE',
'content' : 'Are you sure you want to delete ' + event.title + '?'
}, {
'name' : 'MESSAGE',
'content' : 'Hi ' + event.creator.name + ',<br /><br />' +
'A request has been made to delete this event. If you would like to delete it click the button below. If you did not make this request, please ignore this email.'
}, {
'name' : 'BUTTONTEXT',
'content' : 'Delete Event'
}, {
'name' : 'BUTTONLINK',
'content' : app.get('absoluteUrl')('delete/'+event._id+'/code/'+event.__private.deleteCode)
}]
}
mandrill_client.messages.sendTemplate({
message : message,
template_name : 'rallly-standard',
async : true,
template_content : []
}, mandrillSuccessHandler, mandrillErrorHandler);
}
var mandrillSuccessHandler = function(result){
if (result.length == 1) {
debug('Email sent to ' + result[0].email);
} else {
debug('Email sent to ' + result.length + ' recipients');
}
}
var mandrillErrorHandler = function(e){
debug('A mandrill error occurred: ' + e.name + ' - ' + e.message);
}
// /*
// Email Notifications Helper Class
// */
//
// var app = require('../app');
// var communicator = require('../communicator');
// var debug = require('debug')('rallly');
// var mandrill = require('mandrill-api');
// var mandrill_client = new mandrill.Mandrill(app.get('mandrillAPIKey'));
//
// communicator.on('event:create', function(event){
// if (!event.creator.allowNotifications && event.isClosed) return;
// sendEmailConfirmation(event);
// sendInvites(event);
// });
//
// communicator.on('event:update:creator.email', function(event, oldEvent){
// if (!event.creator.allowNotifications && event.isClosed) return;
// verifyEmail(event);
// });
//
// communicator.on('event:delete', function(event){
// deleteConfirmation(event);
// });
//
// // Send confirmation to the creator of the event with a link to verify the creators email address
// var sendEmailConfirmation = function(event){
// var message = {
// subject : "Rallly: " + event.title + " - Verify Email Address",
// from_email : 'noreply@rallly.co',
// from_name : 'Rallly',
// to: [{
// 'email': event.creator.email
// }],
// global_merge_vars : [{
// 'name' : 'TITLE',
// 'content' : 'Your event ' + event.title + ' has been created successfully.'
// }, {
// 'name' : 'MESSAGE',
// 'content' : 'Hi ' + event.creator.name + ',<br /><br />' +
// 'An email has been sent to each participant with a link to the event.<br /><br />' +
// 'Important: To continue receiving email notifications about this event, please click the button below to verify your email address.'
// }, {
// 'name' : 'BUTTONTEXT',
// 'content' : 'Verify Email Address'
// }, {
// 'name' : 'BUTTONLINK',
// 'content' : app.get('absoluteUrl')('verify/'+event._id+'/code/'+event.__private.verificationCode)
// }]
// }
// mandrill_client.messages.sendTemplate({
// message : message,
// template_name : 'rallly-standard',
// async : true,
// template_content : []
// }, mandrillSuccessHandler, mandrillErrorHandler);
// }
//
// // Send an invite to all participants of the evnet
// var sendInvites = function(event){
// event.emails.forEach(function(item){
// var toEmail = item.email;
// var message = {
// subject : "Rallly: " + event.title,
// from_email : 'noreply@rallly.co',
// from_name : 'Rallly',
// to: [{
// 'email': toEmail
// }],
// headers : {
// 'Reply-To' : event.creator.email
// },
// global_merge_vars : [{
// 'name' : 'TITLE',
// 'content' : event.creator.name + ' has invited you to participate in their event: ' + event.title, }, {
// 'name' : 'MESSAGE',
// 'content' : 'Rallly is a free collaborative scheduling service that lets you and your friends vote on a date to host an event. ' +
// 'Click on the button below to visit the event page and vote on the dates that best suit you. '
// }, {
// 'name' : 'BUTTONTEXT',
// 'content' : 'View Event'
// }, {
// 'name' : 'BUTTONLINK',
// 'content' : app.get('absoluteUrl')(event._id)
// }]
// }
// mandrill_client.messages.sendTemplate({
// message : message,
// template_name : 'rallly-standard',
// async : true,
// template_content : []
// }, mandrillSuccessHandler, mandrillErrorHandler);
// })
// }
//
// // This message is sent when the user want to verify an email address after the event has been created
// var verifyEmail = function(event){
// var message = {
// subject : "Rallly: " + event.title + " - Verify Email Address",
// from_email : 'noreply@rallly.co',
// from_name : 'Rallly',
// to: [{
// 'email': event.creator.email
// }],
// global_merge_vars : [{
// 'name' : 'TITLE',
// 'content' : 'Please verify your email address to receive updates from this event.'
// }, {
// 'name' : 'MESSAGE',
// 'content' : 'Hi ' + event.creator.name + ',<br /><br />' +
// 'If you would like to receive email updates from this event, please click on the button below to verify your email address.'
// }, {
// 'name' : 'BUTTONTEXT',
// 'content' : 'Verify Email Address'
// }, {
// 'name' : 'BUTTONLINK',
// 'content' : app.get('absoluteUrl')('verify/'+event._id+'/code/'+event.__private.verificationCode)
// }]
// }
// mandrill_client.messages.sendTemplate({
// message : message,
// template_name : 'rallly-standard',
// async : true,
// template_content : []
// }, mandrillSuccessHandler, mandrillErrorHandler);
// }
//
// var sendUpdate = function(event){
// var message = {
// subject : "Rallly: " + event.title + " - Verify Email Address",
// from_email : 'noreply@rallly.co',
// from_name : 'Rallly',
// to: [{
// 'email': event.creator.email
// }],
// global_merge_vars : [{
// 'name' : 'Name',
// 'content' : event.creator.name
// }, {
// 'name' : 'Event',
// 'content' : event.title
// }, {
// 'name' : 'VerifyUrl',
// 'content' : app.get('absoluteUrl')('verify/'+event._id+'/code/'+event.creator.verificationCode)
// }]
// }
// mandrill_client.messages.sendTemplate({
// message : message,
// template_name : 'rallly-standard',
// async : true,
// template_content : []
// }, mandrillSuccessHandler, mandrillErrorHandler);
// }
//
// var deleteConfirmation = function(event){
// var message = {
// subject : "Rallly: " + event.title + " - Delete Request",
// from_email : 'noreply@rallly.co',
// from_name : 'Rallly',
// to: [{
// 'email': event.creator.email
// }],
// global_merge_vars : [{
// 'name' : 'TITLE',
// 'content' : 'Are you sure you want to delete ' + event.title + '?'
// }, {
// 'name' : 'MESSAGE',
// 'content' : 'Hi ' + event.creator.name + ',<br /><br />' +
// 'A request has been made to delete this event. If you would like to delete it click the button below. If you did not make this request, please ignore this email.'
// }, {
// 'name' : 'BUTTONTEXT',
// 'content' : 'Delete Event'
// }, {
// 'name' : 'BUTTONLINK',
// 'content' : app.get('absoluteUrl')('delete/'+event._id+'/code/'+event.__private.deleteCode)
// }]
// }
// mandrill_client.messages.sendTemplate({
// message : message,
// template_name : 'rallly-standard',
// async : true,
// template_content : []
// }, mandrillSuccessHandler, mandrillErrorHandler);
// }
//
// var mandrillSuccessHandler = function(result){
// if (result.length == 1) {
// debug('Email sent to ' + result[0].email);
// } else {
// debug('Email sent to ' + result.length + ' recipients');
// }
// }
//
// var mandrillErrorHandler = function(e){
// debug('A mandrill error occurred: ' + e.name + ' - ' + e.message);
// }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

BIN
public/images/about.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
public/images/contact.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
public/images/home.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2 KiB

View file

@ -1,7 +1,7 @@
angular.module("rallly").run(["$templateCache", function($templateCache) {$templateCache.put("templates/about.html","<div style=\"max-width:600px\">\n <h1>What is Rallly?</h1>\n <div class=\"rl-page-desc\">Rallly is a collaborative scheduling service that makes deciding on a date fast and easy.</div>\n <h2>Hi, I\'m Luke!</h2>\n <p>\n I created Rallly as side project to help me learn some new technologies. I decided to publish it because I thought other people might find it useful. Rallly is a completely free service. In fact it is even open source. You can look at the latest source code on Github.\n </p>\n</div>\n");
$templateCache.put("templates/confirmmodal.html","<div class=\"rl-modal-overlay\" ng-click=\"modal.cancel()\"></div>\n\n<div class=\"rl-modal\">\n <div class=\"rl-modal-title\">{{modal.title}}</div>\n <div class=\"rl-modal-message\">\n {{modal.message}}\n </div>\n <div class=\"rl-modal-actions\">\n <button type=\"button\" ng-click=\"modal.confirm()\" ng-show=\"modal.confirm\" class=\"btn\" ng-class=\"{danger : modal.isDestructive}\">{{modal.confirmText}}</button>\n <button type=\"button\" ng-click=\"modal.cancel()\" class=\"btn\">{{modal.cancelText}}</button>\n </div>\n</div>\n");
$templateCache.put("templates/editevent.html","<div ng-show=\"event._id\">\n <div class=\"box\">\n\n <div class=\"box-title\">Edit Event</div>\n <div class=\"box-description\">\n You can makes changes to your existing event by changing the fields in the form below.\n </div>\n\n <form novalidate name=\"form\" ng-submit=\"submit()\">\n\n <section class=\"box-section\" user-form form=\"form\" event=\"event\">\n\n </section>\n\n <section class=\"box-section\" event-form form=\"form\" event=\"event\">\n\n </section>\n <section class=\"box-section\" date-form form=\"form\" event=\"event\">\n\n </section>\n\n <section class=\"box-section\" settings-form form=\"form\" event=\"event\">\n\n </section>\n\n <div class=\"box-controls box-bottom-sticky\">\n <button type=\"submit\" ng-show=\"didChange()\" class=\"btn btn-primary\" ng-class=\"{disabled : !didChange()}\">\n Save Changes\n </button>\n <button type=\"button\" ng-click=\"undoChanges()\" class=\"btn\" ng-show=\"didChange()\">Undo Changes</button>\n <a href=\"/{{event._id}}\" class=\"btn\" ng-hide=\"didChange()\">Done</a>\n </div>\n\n </form>\n\n </div>\n\n</div>\n");
$templateCache.put("templates/event.html","<div ng-show=\"event._id && !event.isDeleted\">\n <div class=\"box \">\n <div class=\"event-header\">\n <div class=\"avatar\">\n <img src=\"/images/eventicon.png\" width=\"32\" />\n </div>\n <div class=\"details\">\n <div class=\"title\">\n {{event.title}}\n <span class=\"title-label danger\" ng-show=\"event.isClosed\">Poll Closed</span>\n <span class=\"title-label success\" ng-hide=\"event.isClosed\">Poll Open</span>\n </div>\n <div class=\"subtitle\">\n Created by <a href=\"mailto:{{event.creator.email}}\">{{event.creator.name}}</a> &bull; {{event.created | elapsed}}\n </div>\n </div>\n <div class=\"actions\">\n <button class=\"btn\" ng-click=\"editEvent()\">Edit Event</button>\n </div>\n </div>\n <div class=\"box-side-sticky event-description\" ng-show=\"event.description\">{{event.description}}</div>\n <div class=\"box-bottom-sticky event-location\" ng-show=\"event.location\">\n <img src=\"/images/location.png\" width=\"18\" /><a href=\"http://google.com/maps?q={{event.location}}\" target=\"_blank\">{{event.location}}</a>\n </div>\n\n </div>\n <div class=\"box box-x-scroll\">\n <div poll event=\"event\" class=\"poll\">\n </div>\n </div>\n\n <div class=\"box\" ng-hide=\"event.comments.length == 0 && event.isClosed\">\n <div class=\"box-title\">\n Discussion\n </div>\n <div class=\"box-description\">\n You can discuss the event with your friends by leaving a comment below.\n </div>\n <div discussion event=\"event\">\n\n </div>\n </div>\n</div>\n");
$templateCache.put("templates/event.html","<div ng-show=\"event._id && !event.isDeleted\">\n <div class=\"box \">\n <div class=\"event-header\">\n <div class=\"details\">\n <div class=\"title\">\n {{event.title}}\n <span class=\"title-label danger\" ng-show=\"event.isClosed\">Poll Closed</span>\n <span class=\"title-label success\" ng-hide=\"event.isClosed\">Poll Open</span>\n </div>\n <div class=\"subtitle\">\n Created by <a href=\"mailto:{{event.creator.email}}\">{{event.creator.name}}</a> &bull; {{event.created | elapsed}}\n </div>\n </div>\n <div class=\"actions\">\n <button class=\"btn\" ng-click=\"editEvent()\">Edit Event</button>\n </div>\n </div>\n <div class=\"box-side-sticky event-description\" ng-show=\"event.description\">{{event.description}}</div>\n <div class=\"box-bottom-sticky event-location\" ng-show=\"event.location\">\n <img src=\"/images/location.png\" width=\"18\" /><a href=\"http://google.com/maps?q={{event.location}}\" target=\"_blank\">{{event.location}}</a>\n </div>\n\n </div>\n <div class=\"box box-x-scroll\">\n <div poll event=\"event\" class=\"poll\">\n </div>\n </div>\n\n <div class=\"box\" ng-hide=\"event.comments.length == 0 && event.isClosed\">\n <div class=\"box-title\">\n Discussion\n </div>\n <div class=\"box-description\">\n You can discuss the event with your friends by leaving a comment below.\n </div>\n <div discussion event=\"event\">\n\n </div>\n </div>\n</div>\n");
$templateCache.put("templates/home.html","<div class=\"page-placeholder\">\n <div class=\"image\">\n <img src=\"/images/mark_large.png\" width=\"67\" />\n </div>\n <div class=\"title\">\n Schedule an Event\n </div>\n <div class=\"content\">\n Want to host an event but cant decide on a date? Click on the button below to start!\n </div>\n <button ng-click=\"newEvent()\" class=\"btn\">Schedule New Event</button>\n</div>\n");
$templateCache.put("templates/newevent.html","<div ng-if=\"!eventUrl\">\n <div class=\"box\" ng-class=\"{\'animated shake\': form.$submitted && form.$invalid }\">\n\n <div class=\"box-title\">Schedule a New Event</div>\n <div class=\"box-description\">\n Fill in the form below to create your event and share it with your friends and colleagues.\n </div>\n\n <form novalidate autocomplete=\"off\" name=\"form\" ng-submit=\"submit()\">\n <div ng-if=\"page == 1\">\n\n <section class=\"box-section\" user-form form=\"form\" event=\"event\">\n\n </section>\n\n <section class=\"box-section\" event-form form=\"form\" event=\"event\">\n\n </section>\n </div>\n <div ng-if=\"page==2\">\n\n <section class=\"box-section\" date-form form=\"form\" event=\"event\">\n\n </section>\n\n <section class=\"box-section\" ng-show=\"event.dates.length\" time-form form=\"form\" event=\"event\">\n\n </section>\n </div>\n\n <div ng-if=\"page==3\">\n\n <section class=\"box-section\" participants-form form=\"form\" event=\"event\">\n\n </section>\n\n </div>\n\n\n <div class=\"box-controls box-bottom-sticky\">\n <button type=\"button\" ng-if=\"page!=1\" class=\"btn\" ng-click=\"prevPage()\">Back</button>\n <button type=\"button\" ng-if=\"page!=3\" class=\"btn\" ng-click=\"nextPage()\">Next</button>\n <button type=\"submit\" ng-if=\"page==3\" class=\"btn btn-primary\">Create Event</button>\n </div>\n\n </form>\n </div>\n\n</div>\n<div ng-if=\"eventUrl\" class=\"box\">\n <div class=\"box-message\">\n <div class=\"main-image\">\n <img src=\"/images/success_large.png\" width=\"100\" />\n </div>\n <div class=\"title\">Event Created</div>\n <div class=\"content\">\n Your event has been created successfully! You should receive an email shortly with instructions to verify your email address.\n </div>\n <div class=\"mini-divider\">\n </div>\n <div class=\"form-group\">\n <input type=\"text\" class=\"form-control\" disabled=\"true\" value=\"{{eventUrl}}\" />\n <a href=\"{{eventUrl}}\" class=\"btn form-btn\">GO</a>\n </div>\n </div>\n</div>\n");
$templateCache.put("templates/notfound.html","<h1>Error 404</h1>\n<h2>Not Found</h2>\n");
@ -15,7 +15,7 @@ $templateCache.put("templates/form/participantsForm.html","<div class=\"section-
$templateCache.put("templates/form/settingsForm.html","<div class=\"section-details\">\n <div class=\"section-title\">Settings</div>\n</div>\n<div class=\"section-main\">\n <div class=\"switch-row\">\n <div class=\"switch-details\">\n <div class=\"title\">\n Poll Status\n </div>\n <div class=\"description\">\n Let people vote on the poll.\n </div>\n </div>\n <div class=\"switch\">\n <div class=\"switch-value\">\n {{event.isClosed ? \'Closed\' : \'Open\' }}\n </div>\n <div switch-toggle ng-model=\"event.isClosed\" invert>\n </div>\n </div>\n </div>\n <div class=\"switch-row\">\n <div class=\"switch-details\">\n <div class=\"title\">\n Notifications\n </div>\n <div class=\"description\">\n Send email notifications to the creator of this event.\n </div>\n </div>\n <div class=\"switch\">\n <div class=\"switch-value\">\n {{event.creator.allowNotifications ? \'Enabled\' : \'Disabled\' }}\n </div>\n <div switch-toggle ng-model=\"event.creator.allowNotifications\">\n </div>\n </div>\n </div>\n <div class=\"switch-row\">\n <div class=\"switch-details\">\n <div class=\"title\">\n Delete Event\n </div>\n <div class=\"description\">\n Once you delete an event it will no longer be accessible.\n </div>\n </div>\n <div class=\"switch\">\n <button type=\"button\" ng-click=\"deleteEvent()\" class=\"btn\" ng-class=\"{danger : !deleteRequestSent, disabled : deleteRequestSent}\">{{deleteRequestSent ? \'Request Sent\' : \'Delete Event\' }}</button>\n </div>\n </div>\n</div>\n</section>\n");
$templateCache.put("templates/form/timeForm.html","<div class=\"section-details\">\n <div class=\"section-title\">Choose Times</div>\n</div>\n<div class=\"section-main\">\n <table class=\"time-form\">\n <thead>\n <tr>\n <th>\n\n </th>\n <th>\n Time 1\n </th>\n <th>\n Time 2\n </th>\n <th>\n Time 3\n </th>\n </tr>\n </thead>\n <tbody>\n <tr ng-repeat=\"d in event.dates\">\n <td>\n <div class=\"daticon\">\n <div class=\"dow\">\n {{d.date | date: \'EEE\'}}\n </div>\n <div class=\"day\">\n {{d.date | date: \'d\'}}\n </div>\n <div class=\"month\">\n {{d.date | date : \'MMM\'}}\n </div>\n <span class=\"delete\" ng-click=\"unsetDate(d.date)\"></span>\n </div>\n </td>\n <td ng-repeat=\"time in [1,2,3] track by $index\">\n <input type=\"text\" time-picker ng-model-options=\"{ updateOn: \'blur\' }\" ng-model=\"d.times[$index]\" class=\"time-picker-input\" />\n </td>\n </tr>\n </tbody>\n </table>\n</div>\n");
$templateCache.put("templates/form/userForm.html","<div class=\"section-details\">\n <div class=\"section-title\">Your Details</div>\n</div>\n<div class=\"section-main\">\n <div class=\"form-row\">\n <div class=\"form-col\">\n <div class=\"form-group\">\n <label for=\"name\">Name</label>\n <span class=\"form-error\" ng-show=\"(form.name.$touched || form.$submitted) && errors.name\">\n <img src=\"/images/error.png\" width=\"14\" /> {{errors.name}}\n </span>\n <input id=\"name\" name=\"name\" ng-maxlength=\"30\" required ng-model=\"event.creator.name\" type=\"text\" placeholder=\"John Doe...\" class=\"form-control extend\"/>\n </div>\n </div>\n <div class=\"form-col\">\n <div class=\"form-group\">\n <label for=\"email\">Email</label>\n <span class=\"form-error\" ng-show=\"(form.email.$touched || form.$submitted) && errors.email\">\n <img src=\"/images/error.png\" width=\"14\" /> {{errors.email}}\n </span>\n <input type=\"email\" id=\"email\" name=\"email\" ng-pattern=\"emailRegex\" required ng-model=\"event.creator.email\" placeholder=\"john.doe@email.com...\" class=\"form-control extend\"/>\n </div>\n </div>\n </div>\n</div>\n");
$templateCache.put("templates/newEvent/datetime.html","<section class=\"box-section\" date-form form=\"form\" event=\"event\">\n\n</section>\n\n<section class=\"box-section\" ng-show=\"event.dates.length\" time-form form=\"form\" event=\"event\">\n\n</section>\n\n<div class=\"box-controls box-bottom-sticky\">\n <button type=\"button\" class=\"btn\" ng-click=\"prevPage()\">Previous</button>\n <button type=\"submit\" class=\"btn\">Next</button>\n</div>\n");
$templateCache.put("templates/newEvent/datetime.html","<section class=\"box-section\" date-form form=\"form\" event=\"event\">\n\n</section>\n\n<div class=\"box-controls box-bottom-sticky\">\n <button type=\"button\" class=\"btn\" ng-click=\"prevPage()\">Previous</button>\n <button type=\"submit\" class=\"btn\">Next</button>\n</div>\n");
$templateCache.put("templates/newEvent/general.html","<section class=\"box-section\" user-form form=\"form\" event=\"event\">\n\n</section>\n\n<section class=\"box-section\" event-form form=\"form\" event=\"event\">\n\n</section>\n\n<div class=\"box-controls box-bottom-sticky\">\n <button type=\"submit\" class=\"btn\">Next Step</button>\n</div>\n");
$templateCache.put("templates/newEvent/invite.html","<section class=\"box-section\" participants-form form=\"form\" event=\"event\">\n\n</section>\n\n<div class=\"box-controls box-bottom-sticky\">\n <button type=\"button\" class=\"btn\" ng-click=\"prevPage()\">Previous</button>\n <button type=\"submit\" class=\"btn\">Create</button>\n</div>\n");
$templateCache.put("templates/newEvent/layout.html","<div class=\"box\">\n\n <div class=\"box-title\">Schedule a New Event</div>\n <div class=\"box-description\">\n Fill in the form below to create your event and share it with your friends and colleagues.\n </div>\n <ol class=\"box-steps\">\n <li class=\"step active\">\n General Details\n </li>\n <li class=\"step\" ng-class=\"{ active : page > 1 }\">\n Dates &amp; Times\n </li>\n <li class=\"step\" ng-class=\"{ active : page > 2 }\">\n Invites\n </li>\n <li class=\"step\" ng-class=\"{ active : page > 3 }\">\n Done\n </li>\n </ol>\n <form novalidate autocomplete=\"off\" name=\"form\" ng-submit=\"submit()\">\n <div ui-view>\n\n </div>\n </form>\n</div>\n");

View file

@ -1,6 +1,6 @@
@mixin form-input {
border-radius: 2px;
border: 2px solid $border-clr;
border: 1px solid $border-clr;
font-size:em(18px);
@include transition(border-color 0.1s ease-in-out);
&:focus {

View file

@ -1,5 +1,5 @@
$dark-blue-clr: #2E3A54;
$green-clr: #6EBC48;
$green-clr: #75C062;
$pink-clr: #E55A84;
$red-clr: #E06488;
$blue-clr: #5AC4E5;

View file

@ -1,19 +1,25 @@
$navigation-width: 100%;
$top-bar-height: 50px;
$navigation-width: 200px;
$top-bar-height: 60px;
$min-width: 820px;
.outer-container {
width:100%;
height:100%;
overflow:hidden;
}
body {
background: $background-clr;
color: $text-clr;
min-width: $min-width;
}
.main-navigation {
position:fixed;
z-index: 2000;
min-height:100%;
width: $navigation-width;
min-width:$min-width;
background: $navigation-bg-clr;
color: white;
.wrapper {
width: $navigation-width;
@ -23,10 +29,12 @@ body {
.main-content {
background: $background-clr;
min-height:100%;
margin-left: $navigation-width;
height:100%;
overflow-y:scroll;
.main-view {
position:relative;
padding: 80px 40px;
padding: 100px 40px 20px 40px;
width:100%;
min-height: 600px;
}
@ -34,7 +42,10 @@ body {
.top-bar {
width:100%;
box-shadow: 0 1px 2px rgba(black, 0.1);
position:fixed;
top:0;
background: white;
height: $top-bar-height;
z-index: 1000;
line-height: $top-bar-height;
}

View file

@ -1,41 +1,64 @@
$top-space: 15px;
$nav-pad: 20px;
@mixin expand {
padding-left:$nav-pad;
padding-right: $nav-pad;
margin-left: $nav-pad * -1;
width:100%;
@include box-sizing(content-box);
}
.main-navigation {
position:fixed;
width:100%;
z-index: 1000;
.wrapper {
min-width:600px;
background: $navigation-bg-clr;
height: em(60px);
}
padding: 0 $nav-pad;
.logo {
display:inline-block;
vertical-align:middle;
margin-top:$top-space;
display:block;
height: 60px;
line-height:60px;
background: darken($navigation-bg-clr, 3%);
position:relative;
@include transition(background 0.2s ease-in-out);
@include expand;
img {
position:absolute;
top:50%;
margin-top:-12px;
}
}
.menu-section {
@include expand;
font-size:10px;
text-transform:uppercase;
padding : 10px $nav-pad;
border-bottom: 1px solid darken($navigation-bg-clr, 3%);
margin-top:20px;
margin-bottom:20px;
}
.create-new {
display:block;
font-size: 12px;
color: white;
background: $green-clr;
text-decoration: none;
padding: 12px 5px;
border-radius: 2px;
text-align: center;
font-weight: bold;
@include box-sizing(content-box);
width: 100%;
margin-left:-5px;
}
.navigation {
display:inline-block;
vertical-align:middle;
margin-left: 60px;
margin-top:$top-space;
.links {
padding:0 ;
margin:0;
list-style: none;
display:inline-block;
li {
display:inline-block;
margin-right:em(20px);
}
a {
display:block;
text-decoration: none;
color: #616F8D;
font-weight: bold;
line-height: em(24px);
font-size: em(15px);
opacity: 0.7;
line-height: em(40px);
font-size: em(12px);
&:hover {
opacity: 1;
color:white;
@ -52,50 +75,17 @@ $top-space: 15px;
}
}
.text {
vertical-align:middle;
}
.icon {
display:inline-block;
vertical-align:middle;
margin-right: 5px;
width:16px;
height:16px;
background-size: 16px 32px;
margin-right: 10px;
width:24px;
height:24px;
background-size: 24px 48px;
}
}
}
}
.create-new {
display:inline-block;
float:right;
padding: 13px;
// border-bottom:1px solid lighten($navigation-bg-clr, 5%);
a {
display:block;
@include transition(background-color 0.1s ease-in-out);
color:tint($green-clr,90%);
text-align:center;
border-radius: 2px;
@include linear-gradient(lighten($green-clr,8%), lighten($green-clr,2%));
text-decoration:none;
font-size:12px;
font-weight: bold;
// text-shadow: 0 1px 1px darken($green-clr, 10%);
padding: 8px 15px 10px 12px;
&:hover {
}
&:active {
box-shadow: inset 0 2px 5px rgba(black,0.1), 0 0 0 1px darken($navigation-bg-clr, 8%);
}
img {
vertical-align:middle;
margin-right: 5px;
margin-top: -2px;
}
span {
}
}
}
}

View file

@ -1,11 +1,11 @@
.top-bar {
float: left;
width: 100%;
background:rgba(white,0.9);
box-shadow: 0 1px 2px rgba($border-clr, 0.5);
.primary {
list-style:none;
margin:0;
padding-left:40px;
padding-left:20px;
margin-top:-4px;
.item {
img {
@ -45,7 +45,7 @@
border: 1px solid $border-clr;
border-radius: 3px;
padding: 20px;
margin-top:-9px;
margin-top:-14px;
border-top-left-radius:0;
box-shadow: 0 2px 3px $border-clr;
.dropdown-title {

View file

@ -64,17 +64,6 @@
.event-header {
width: 100%;
margin-top: -30px;
.avatar {
display:inline-block;
margin-right: 20px;
text-align: center;
border-radius: 1px;
box-shadow: 0 0 0 5px white, 0 0 0 6px $border-clr, inset 0 0 0 1px $border-clr;
padding: 20px;
background:$background-clr;
vertical-align: bottom;
}
.details {
display:inline-block;
.title {
@ -113,7 +102,6 @@
.actions {
visibility:hidden;
float: right;
margin-top: 30px;
}
&:hover {
.actions {

View file

@ -7,6 +7,7 @@ $box-h-pad: 25px;
border-radius: 3px;
margin: 0 auto 20px auto;
max-width: 800px;
min-width:700px;
overflow:hidden;
padding: $box-v-pad $box-h-pad;
&.box-x-scroll {
@ -22,9 +23,6 @@ $box-h-pad: 25px;
border-color: $blue-clr;
box-shadow: 0 0 3px rgba($blue-clr, 0.5);
}
&:last-child {
margin-bottom: 40px;
}
}
.box-title {

View file

@ -148,7 +148,8 @@
padding:5px;
text-align:left;
li {
margin-bottom: 10px;
display:inline-block;
margin: 10px 10px 0 0;
}
}

View file

@ -1,9 +1,6 @@
<div ng-show="event._id && !event.isDeleted">
<div class="box ">
<div class="event-header">
<div class="avatar">
<img src="/images/eventicon.png" width="32" />
</div>
<div class="details">
<div class="title">
{{event.title}}

View file

@ -2,10 +2,6 @@
</section>
<section class="box-section" ng-show="event.dates.length" time-form form="form" event="event">
</section>
<div class="box-controls box-bottom-sticky">
<button type="button" class="btn" ng-click="prevPage()">Previous</button>
<button type="submit" class="btn">Next</button>

View file

@ -34,12 +34,59 @@
</head>
<body>
<div class="outer-container">
<div class="main-navigation">
<a href="/" class="logo">
<img src="/images/logo.png" width="100" />
</a>
<div class="menu-section">
Menu
</div>
<nav class="navigation">
<ul class="links" ng-controller="NavigationCtrl">
<li>
<a href="/" ng-class="{active : isActive('/')}">
<i back-img="home" class="icon"></i>
<span class="text">Homepage</span>
</a>
</li>
<li>
<a href="/about" ng-class="{active : isActive('/about')}">
<i back-img="about" class="icon"></i>
<span class="text">What is Rallly?</span>
</a>
</li>
<li>
<a href="/contact" ng-class="{active : isActive('/contact')}">
<i back-img="contact" class="icon"></i>
<span class="text">Contact</span>
</a>
</li>
</ul>
</nav>
<div class="menu-section">
Link
</div>
<a class="create-new" href="/new">Schedule an event</a>
</div>
<div class="main-content">
<div class="top-bar">
<ul class="primary ng-scope" ng-controller="AccountCtrl">
<li class="item dropdown" dropdown="">
<a class="dropdown-toggle hoverable" ng-click="toggle()" href="#">
<img src="/images/person.png" height="16">
<span>Guest</span>
</a>
<div class="dropdown-menu">
<div class="dropdown-content">
User accounts will be added soon.
</div>
</div>
</li>
</ul>
</div>
<div ui-view class="main-view">
</div>
</div>
</div>
</body>
</html>