diff options
| -rw-r--r-- | server/index.js | 1 | ||||
| -rw-r--r-- | server/lib/middleware.js | 1 | ||||
| -rw-r--r-- | views/partials/edit-profile.ejs | 102 | ||||
| -rw-r--r-- | views/partials/footer.ejs | 13 | ||||
| -rw-r--r-- | views/partials/header.ejs | 7 |
5 files changed, 71 insertions, 53 deletions
diff --git a/server/index.js b/server/index.js index 01f861b..05d353d 100644 --- a/server/index.js +++ b/server/index.js @@ -69,6 +69,7 @@ app.get('/auth/twitter/callback', auth.loggedIn('twitter')); app.get('/auth/facebook', auth.login('facebook')); app.get('/auth/facebook/callback', auth.loggedIn('facebook')); app.get('/profile', views.profile) +app.get('/profile/edit', views.profile) app.get(/^\/([-_a-zA-Z0-9]+)\/?$/, views.profile) diff --git a/server/lib/middleware.js b/server/lib/middleware.js index 83613e3..fb19e68 100644 --- a/server/lib/middleware.js +++ b/server/lib/middleware.js @@ -40,6 +40,7 @@ var middleware = { res.locals.logged_in = req.isAuthenticated() res.locals.user = req.user || {} res.locals.config = config + res.locals.profile = null next() }, diff --git a/views/partials/edit-profile.ejs b/views/partials/edit-profile.ejs index 1ac69d7..d7c9a34 100644 --- a/views/partials/edit-profile.ejs +++ b/views/partials/edit-profile.ejs @@ -14,54 +14,56 @@ <input id="element_3_1" name= "element_3_1" class="element text" type="text" maxlength="255" value="Ivan Sidorov"/> </div> </li> - <li> - <label class="description" for="element_2">Website:</label> - <div> - <input id="element_2" name="element_2" class="element text medium" type="text" maxlength="255" value="http://"/> - </div> - </li> - <li> - <label class="description" for="element_5">Twitter:</label> - <div> - <input id="element_5" name="element_5" class="element text medium" type="text" maxlength="255" value="@"/> - </div> - </li> - <li> - <label class="description" for="element_4">Facebook:</label> - <div> - <input id="element_4" name="element_4" class="element text medium" type="text" maxlength="255" value="http://"/> - </div> - </li> - <li> - <label class="description" for="element_1">Upload Avatar:</label> - <div> - <input id="element_1" name="element_1" class="element file" type="file"/> - </div> <p class="guidelines" id="guide_1"><small>please choose a picture at least 500px wide</small></p> - </li> - <li class="section_break"> - <h3>Edit Password</h3> - </li> - <li> - <label class="description" for="element_7">Old Password:</label> - <div> - <input id="element_7" name="element_7" class="element text medium" type="password" maxlength="255" value=""/> - </div> - </li> - <li> - <label class="description" for="element_8">New Password:</label> - <div> - <input id="element_8" name="element_8" class="element text medium" type="password" maxlength="255" value=""/> - </div> - </li> - <li> - <label class="description" for="element_9">Again!</label> - <div> - <input id="element_9" name="element_9" class="element text medium" type="password" maxlength="255" value=""/> - </div> - </li> + <li> + <label class="description" for="element_2">Website:</label> + <div> + <input id="element_2" name="element_2" class="element text medium" type="text" maxlength="255" value="http://"/> + </div> + </li> + <li> + <label class="description" for="element_5">Twitter:</label> + <div> + <input id="element_5" name="element_5" class="element text medium" type="text" maxlength="255" value="@"/> + </div> + </li> + <li> + <label class="description" for="element_4">Facebook:</label> + <div> + <input id="element_4" name="element_4" class="element text medium" type="text" maxlength="255" value="http://"/> + </div> + </li> + <li> + <label class="description" for="element_1">Upload Avatar:</label> + <div> + <input id="element_1" name="element_1" class="element file" type="file"/> + </div> <p class="guidelines" id="guide_1"><small>please choose a picture at least 500px wide</small></p> + </li> + <li class="section_break"> + <h3>Edit Password</h3> + </li> + <li> + <label class="description" for="element_7">Old Password:</label> + <div> + <input id="element_7" name="element_7" class="element text medium" type="password" maxlength="255" value=""/> + </div> + </li> + <li> + <label class="description" for="element_8">New Password:</label> + <div> + <input id="element_8" name="element_8" class="element text medium" type="password" maxlength="255" value=""/> + </div> + </li> + <li> + <label class="description" for="element_9">Again!</label> + <div> + <input id="element_9" name="element_9" class="element text medium" type="password" maxlength="255" value=""/> + </div> + </li> - <li class="buttons"> - <input id="saveForm" class="button_text" type="submit" name="submit" value="Submit" /> - </li> - </ul> - </form>
\ No newline at end of file + <li class="buttons"> + <input id="saveForm" class="button_text" type="submit" name="submit" value="Submit" /> + </li> + </ul> + </form> + </div> +</div>
\ No newline at end of file diff --git a/views/partials/footer.ejs b/views/partials/footer.ejs index f1bd0a8..df48cf3 100644 --- a/views/partials/footer.ejs +++ b/views/partials/footer.ejs @@ -1,5 +1,18 @@ <div class="footer"> + <a href="/about">About</a> <a href="/faq">FAQ</a> + <span>©2014 VVALLS Inc.</span> + + [[ if (user) { ]] + <br><br> + + <span> + you are signed in as → + <a href="/[[- user.name ]]">[[- user.displayName ]]</a> + <a href="/logout" class="topLink">Sign Out?</a> + </span> + [[ } ]] + </div> diff --git a/views/partials/header.ejs b/views/partials/header.ejs index fce96cc..d6c8fa9 100644 --- a/views/partials/header.ejs +++ b/views/partials/header.ejs @@ -2,10 +2,11 @@ <span class="topLinks"> [[ if (logged_in) { ]] - <span>[[- user.displayName ]]</span> - <a href="/profile" class="topLink">View Profile</a> + [[ if (profile && user._id == profile._id) { ]] <a href="/profile" data-role="edit-profile-modal" class="topLink editProfile">Edit Profile <span class="icon-ios7-gear-outline"></span></a> - <a href="/logout" class="topLink">Sign Out</a> + [[ } else if (! profile) { ]] + <a href="/profile" class="topLink">View Profile</a> + [[ } ]] [[ } else { ]] <a href="#" data-role="show-signup-modal" class="signUp topLink">Sign Up</a> <a href="#" data-role="show-signin-modal" class="signIn topLink">Sign In</a> |