diff --git a/api/event/event.controller.js b/api/event/event.controller.js index 637908ac5..5074c8c9a 100644 --- a/api/event/event.controller.js +++ b/api/event/event.controller.js @@ -49,6 +49,7 @@ exports.deleteParticipant = function(req, res, next){ }); } + function handleError(res, err) { return res.status(500).send(err); } diff --git a/config/routes.js b/config/routes.js index 19e5ab978..b64177187 100644 --- a/config/routes.js +++ b/config/routes.js @@ -2,7 +2,9 @@ module.exports = function(app) { // Insert routes below app.use('/api/event', require('../api/event')); - + app.use('/about', function(req, res){ + res.render('about.ejs'); + }); // All undefined asset or api routes should return a 404 // app.route('/:url(api|auth|components|app|bower_components|assets)/*') // .get(errors[404]); diff --git a/public/scss/partials/_newevent.scss b/public/scss/partials/_newevent.scss new file mode 100644 index 000000000..63a2a43de --- /dev/null +++ b/public/scss/partials/_newevent.scss @@ -0,0 +1,10 @@ +.form-global-error { + display:inline-block; + margin-left: em(5px); + font-size: em(12px); + color: $red-clr; + img { + vertical-align:middle; + margin-right: em(5px); + } +} diff --git a/public/scss/partials/_type.scss b/public/scss/partials/_type.scss index 6bd6c5eed..eb4e89b69 100644 --- a/public/scss/partials/_type.scss +++ b/public/scss/partials/_type.scss @@ -9,9 +9,8 @@ h1 { h2 { font-weight:600; - font-size:em(18px); + font-size:em(14px); color: $text-clr; - border-bottom: 1px solid #ddd; padding-bottom:5px; small { margin-left: em(10px); @@ -33,4 +32,7 @@ h2 { p { color: $body-clr; + a { + color: $primary-clr; + } } diff --git a/public/scss/partials/_vars.scss b/public/scss/partials/_vars.scss index 188076a85..9c3664ee3 100644 --- a/public/scss/partials/_vars.scss +++ b/public/scss/partials/_vars.scss @@ -4,7 +4,7 @@ $primary-font: "Source Sans Pro"; /****** BASIC *******/ /****** COLORS *******/ -$primary-clr: #5A98E5; +$primary-clr: #60DF9D; $dark-gray-clr: #969FA9; $light-gray-clr: #f9f9f9; $text-clr: #3D4752; diff --git a/public/scss/style.scss b/public/scss/style.scss index c308e801e..b7dbe23f1 100644 --- a/public/scss/style.scss +++ b/public/scss/style.scss @@ -4,14 +4,14 @@ @import "partials/normalize"; @import "bourbon/bourbon"; @import "neat/neat"; -$mobile: new-breakpoint(max-width 1000px 4); +$mobile: new-breakpoint(max-width 768px 4); body { font-size: em(18px); @include font(); color: $text-clr; - @include media($mobile){ - font-size: em(14px); + @include media($mobile) { + font-size: em(15px); } } @import "partials/header"; @@ -20,8 +20,34 @@ body { @import "partials/form"; @import "partials/datepicker"; @import "partials/event"; +@import "partials/newevent"; +@import "partials/eventsuccess"; .container { - @include outer-container(); - padding: 40px; + @include outer-container(800px); + padding: em(30px) em(40px); +} + +.rl-section { + @include outer-container(800px); + border-top:1px solid #ddd; + padding-top: em(20px); + margin-bottom: em(20px); +} + +.rl-section-details { + @include span-columns(3); + h2 { + margin-top: em(5px); + } +} + +.rl-section-main { + @include span-columns(9); +} + +.rl-page-desc { + font-size: em(21px); + color: $body-clr; + margin-bottom: em(20px); } diff --git a/public/templates/event.html b/public/templates/event.html index 548b8359b..02ea9d8ec 100644 --- a/public/templates/event.html +++ b/public/templates/event.html @@ -1,51 +1,79 @@
- -
-

When can you make it?

-
- - - - - + + + + + + + + + + + + + + + +
+
    +
  • + Created by {{event.creator.name}} +
    • +
  • + {{event.location}} +
    • +
  • + {{event.participants.length}} participants +
    • +
+
{{event.description}}
+ - 		-
-
- {{date | date: 'd'}} +

When can you make it?

+
+ + + + + + - - - - - - - - - - - - -
+ {{event.participants.length}} participants + +
+
+ {{date | date: 'EEE'}} +
+
+ {{date | date: 'd'}} +
+
+ {{date | date : 'MMM'}} +
-
- {{date | date : 'MMM'}} -
- -
- {{participant.name}} - Delete - - -
- - - -
- - +
+ +
+ + + {{participant.name}} + + + + + + Edit + Save + +
+ + + + + + +
+
diff --git a/public/templates/new.html b/public/templates/new.html index 124768bdf..2e317cd96 100644 --- a/public/templates/new.html +++ b/public/templates/new.html @@ -1,70 +1,71 @@ -

New Event

-

Write down a name for your event and choose a number of dates for your friends to decide from.

-
-
-
-

Your Details

+
+

Schedule New Event

+
+ Fill in the form below to create your event and share it with your friends and colleagues. +
+
+ +
-
{{errors['creator.name'].message}}
-
{{errors['creator.email'].message}}
-
-

Event Details

-
-
-
- - -
{{errors.title.message}}
-
-
-
-
- - -
-
-
- -
-
- - -
-
-
-
-

Invite Participants

-
-
- - -
-
- -
-
-

Choose Dates

+
+
+ +
-
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+ + +
+
+
+
+
+ +
+
+
  • +
    + {{date | date: 'EEE'}} +
    {{date | date: 'd'}}
    @@ -77,10 +78,33 @@
-
- - - - - -
+ +
+ +
+
+
+ + +
+
+ + Oops! Looks like you missed something! +
+
+
+
+ +

Good Job!

+

+ Your event has been created. An email has been sent to all the participants with a link to the event page. Make sure you visit the page and vote on the dates yourself. +

+

+ +

+

+ Go to the event page. +

+
diff --git a/views/about.ejs b/views/about.ejs new file mode 100644 index 000000000..fcab38d71 --- /dev/null +++ b/views/about.ejs @@ -0,0 +1,29 @@ + + + Rallly - Collabrative Scheduling + + + + +
+
+
+ + Rallly - Collabrative Scheduling + +
+
+ +
+
+ +
+

About

+
+ + diff --git a/views/index.ejs b/views/index.ejs index 0b98d10d4..8db35e636 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -13,6 +13,7 @@
+
Rallly - Collabrative Scheduling @@ -20,12 +21,13 @@
+